summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-14 10:29:37 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-14 10:29:37 -0800
commitba56d7057a5da9eb3485391658ba7465c855a8f3 (patch)
treea0773d7dc3fcc6c91e1df1fc34098e203bf9e37e /git-mergetool.sh
parent393b7c3cd7c87a42e2e477de38d4a6e4981db8bb (diff)
parent2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 (diff)
downloadgit-ba56d7057a5da9eb3485391658ba7465c855a8f3.tar.gz
Merge branch 'al/mergetool-printf-fix'
* al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains %
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index c0ee9aaf81..332528ff45 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -403,7 +403,7 @@ then
fi
printf "Merging:\n"
-printf "$files\n"
+printf "%s\n" "$files"
IFS='
'