diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-01-25 01:43:50 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-25 11:07:54 -0800 |
| commit | 62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562 (patch) | |
| tree | bc0fe283cac226e85c9404601d608b76e8015587 /merge-recursive.c | |
| parent | git-mergetool: remove redundant assignment (diff) | |
| download | tgif-62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions