projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Documentation/git-add: kill remaining <filepattern>
[git.git]
/
git-difftool--helper.sh
diff --git
a/git-difftool--helper.sh
b/git-difftool--helper.sh
index 3d0fe0cd93b393a5f376aa10505e927fbed37f8f..b00ed95dba9c035ee812d3a2d6db2d13a1944a33 100755
(executable)
--- a/
git-difftool--helper.sh
+++ b/
git-difftool--helper.sh
@@
-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]: " \