diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
commit | cf7864837c12c396ad5927cb6c0bbaa790cda7ad (patch) | |
tree | 93c489a5a4bfb1fde21851d3b9154990ec528b9a /t/t6035-merge-dir-to-symlink.sh | |
parent | Merge branch 'jk/maint-commit-document-editmsg' (diff) | |
parent | mergetool: support --tool-help option like difftool does (diff) | |
download | tgif-cf7864837c12c396ad5927cb6c0bbaa790cda7ad.tar.xz |
Merge branch 'jc/mergetool-tool-help'
"git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.
* jc/mergetool-tool-help:
mergetool: support --tool-help option like difftool does
Diffstat (limited to 't/t6035-merge-dir-to-symlink.sh')
0 files changed, 0 insertions, 0 deletions