diff options
| author | John Keeping <john@keeping.me.uk> | 2013-01-25 09:43:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-25 19:07:54 (GMT) |
| commit | 62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562 (patch) | |
| tree | bc0fe283cac226e85c9404601d608b76e8015587 | |
| parent | 26daa842dc35b2fe522ef18a1404c72421b3894c (diff) | |
| download | git-62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562.zip git-62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562.tar.gz git-62b6f7e021cd5e7a7c3ee8d46ec45fe39d1bf562.tar.bz2 | |
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>
| -rw-r--r-- | git-mergetool--lib.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 1748315..4c1e129 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -188,12 +188,14 @@ show_tool_help () { unavailable="$unavailable$i$LF" fi done + + cmd_name=${TOOL_MODE}tool if test -n "$available" then - echo "'git mergetool --tool=<tool>' may be set to one of the following:" + echo "'git $cmd_name --tool=<tool>' may be set to one of the following:" echo "$available" | sort | sed -e 's/^/ /' else - echo "No suitable tool for 'git mergetool --tool=<tool>' found." + echo "No suitable tool for 'git $cmd_name --tool=<tool>' found." fi if test -n "$unavailable" then |