diff options
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 2f31fa2417..cbbb707959 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -393,8 +393,11 @@ if test $# -eq 0 ; then echo "No files need merging" exit 0 fi - echo Merging the files: $files - git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i + echo Merging the files: "$files" + git ls-files -u | + sed -e 's/^[^ ]* //' | + sort -u | + while IFS= read i do printf "\n" merge_file "$i" < /dev/tty > /dev/tty |