X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-mergetool.sh;h=cbbb707959cc64427f7bbd7bfefb0a8f0f263596;hb=111dd25f3c34ccad101047c32e89d1bb87136f60;hp=2f31fa2417300180662b66afdde11bdf1d6febb2;hpb=c3d51cd16a8db417b89608a37410cf3bf8a5b137;p=git.git

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 2f31fa241..cbbb70795 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