undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests 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
commit ba56d7057a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-difftool--helper.sh
View File

@ -40,7 +40,7 @@ launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool. # the user with the real $MERGED name before launching $merge_tool.
if should_prompt if should_prompt
then then
printf "\nViewing: '$MERGED'\n" printf "\nViewing: '%s'\n" "$MERGED"
if use_ext_cmd if use_ext_cmd
then then
printf "Launch '%s' [Y/n]: " \ printf "Launch '%s' [Y/n]: " \

2
git-mergetool.sh
View File

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