projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jk/rebase-i-comment-char'
[git.git]
/
git-mergetool.sh
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index c0ee9aaf8136a6b5e3e7401504204caa9fcc4fe8..332528ff4556116f9ff22c257e49825954a183fb 100755
(executable)
--- 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='
'