diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 18:29:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 18:29:37 (GMT) |
| commit | ba56d7057a5da9eb3485391658ba7465c855a8f3 (patch) | |
| tree | a0773d7dc3fcc6c91e1df1fc34098e203bf9e37e /git-mergetool.sh | |
| parent | 393b7c3cd7c87a42e2e477de38d4a6e4981db8bb (diff) | |
| parent | 2a9ccfff5553b8ab28eb5a172738cc9f3afadcd5 (diff) | |
| download | git-ba56d7057a5da9eb3485391658ba7465c855a8f3.zip git-ba56d7057a5da9eb3485391658ba7465c855a8f3.tar.gz git-ba56d7057a5da9eb3485391658ba7465c855a8f3.tar.bz2 | |
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-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index c0ee9aa..332528f 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=' ' |