diff --git a/git-mergetool.sh b/git-mergetool.sh index 2f31fa2..8521ca3 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -394,7 +394,7 @@ if test $# -eq 0 ; then exit 0 fi echo Merging the files: $files - git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i + git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while IFS=\n read i do printf "\n" merge_file "$i" < /dev/tty > /dev/tty