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>

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 1748315bc2b45db2b078a3ff293f779d18f7026d..4c1e1292a68b28cc88483fc5edc0df775cf6eec4 100644 (file)
--- 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