Skip to content

Commit

Permalink
Merge branch 'al/mergetool-printf-fix' into maint
Browse files Browse the repository at this point in the history
* al/mergetool-printf-fix:
  difftool--helper: fix printf usage
  git-mergetool: print filename when it contains %
  • Loading branch information
Junio C Hamano committed Feb 25, 2013
2 parents 75288cc + 2a9ccff commit b79faa9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion git-difftool--helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool.
if should_prompt
then
printf "\nViewing: '$MERGED'\n"
printf "\nViewing: '%s'\n" "$MERGED"
if use_ext_cmd
then
printf "Launch '%s' [Y/n]: " \
Expand Down
2 changes: 1 addition & 1 deletion git-mergetool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ then
fi

printf "Merging:\n"
printf "$files\n"
printf "%s\n" "$files"

IFS='
'
Expand Down

0 comments on commit b79faa9

Please sign in to comment.