Merge branch 'al/mergetool-printf-fix'

* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %

diff --combined git-mergetool.sh
index c0ee9aaf8136a6b5e3e7401504204caa9fcc4fe8,012afa55494cc968831b8115f9e2956f107bbb45..332528ff4556116f9ff22c257e49825954a183fb
--- 1/git-mergetool.sh
--- 2/git-mergetool.sh
+++ b/git-mergetool.sh
@@@ -315,6 -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
@@@ -403,7 -440,7 +403,7 @@@ the
  fi
  
  printf "Merging:\n"
- printf "$files\n"
+ printf "%s\n" "$files"
  
  IFS='
  '