Merge branch 'nd/status-show-in-progress'

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c50e18a8998c1f4ca1449e1733f76cb769f501b9..332528ff4556116f9ff22c257e49825954a183fb 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -315,43 +315,6 @@ merge_file () {
        return 0
 }
 
-show_tool_help () {
-       TOOL_MODE=merge
-       list_merge_tool_candidates
-       unavailable= available= LF='
-'
-       for i in $tools
-       do
-               merge_tool_path=$(translate_merge_tool_path "$i")
-               if type "$merge_tool_path" >/dev/null 2>&1
-               then
-                       available="$available$i$LF"
-               else
-                       unavailable="$unavailable$i$LF"
-               fi
-       done
-       if test -n "$available"
-       then
-               echo "'git mergetool --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."
-       fi
-       if test -n "$unavailable"
-       then
-               echo
-               echo 'The following tools are valid, but not currently available:'
-               echo "$unavailable" | sort | sed -e 's/^/       /'
-       fi
-       if test -n "$unavailable$available"
-       then
-               echo
-               echo "Some of the tools listed above only work in a windowed"
-               echo "environment. If run in a terminal-only session, they will fail."
-       fi
-       exit 0
-}
-
 prompt=$(git config --bool mergetool.prompt || echo true)
 
 while test $# != 0
@@ -440,7 +403,7 @@ then
 fi
 
 printf "Merging:\n"
-printf "$files\n"
+printf "%s\n" "$files"
 
 IFS='
 '