| commit | cf7864837c12c396ad5927cb6c0bbaa790cda7ad | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Jul 2012 21:05:26 +0000 (24 14:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Jul 2012 21:05:26 +0000 (24 14:05 -0700) | ||
| tree | 93c489a5a4bfb1fde21851d3b9154990ec528b9a | treesnapshot (tar.gz zip) |
| parent | 9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32 | commitdiff |
| parent | 109859e27445a3ad12eb8f8cba43a5aa8f701733 | commitdiff |
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
"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