GIT-VERSION-GEN: support non-standard $GIT_DIR path

[thirdparty/git.git] / git-mergetool.sh

diff --git a/git-mergetool.sh b/git-mergetool.sh
index c50e18a8998c1f4ca1449e1733f76cb769f501b9..012afa55494cc968831b8115f9e2956f107bbb45 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -440,7 +440,7 @@ then
 fi
 
 printf "Merging:\n"
-printf "$files\n"
+printf "%s\n" "$files"
 
 IFS='
 '