global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'al/mergetool-printf-fix'

Browse Source 
* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %
This commit is contained in:
Junio C Hamano
2013-02-14 10:29:37 -08:00
parent 393b7c3cd7 2a9ccfff55
commit ba56d7057a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@@ -403,7 +403,7 @@ then
fi
printf "Merging:\n"
printf "$files\n"
printf "%s\n" "$files"
IFS='
'