| commit | 62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562 | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 25 Jan 2013 09:43:50 +0000 (25 01:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Jan 2013 19:07:54 +0000 (25 11:07 -0800) | ||
| tree | bc0fe283cac226e85c9404601d608b76e8015587 | treesnapshot (tar.gz zip) |
| parent | 26daa842dc35b2fe522ef18a1404c72421b3894c | commitdiff |
git-mergetool: don't hardcode 'mergetool' in show_tool_help
When using show_tool_help from git-difftool we will want it to print
"git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When using show_tool_help from git-difftool we will want it to print
"git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool--lib.sh | diffblobblamehistory |