X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=74f07610fa2042ef0f2cb12c051d3be9139a680b;hb=5b5d4d9e1b31997b3179e6a253d47b7eea03d0fa;hp=0a158ef779eb8717f27e632e31726f00586979ed;hpb=695bf722da848e0cd2692bc07c4a2773c52b4216;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 0a158ef7..74f07610 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -293,7 +293,7 @@ for remote
 do
 	echo $remote
 done >"$GIT_DIR/MERGE_HEAD"
-echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
 
 if test "$merge_was_ok" = t
 then
@@ -301,5 +301,17 @@ then
 	"Automatic merge went well; stopped before committing as requested"
 	exit 0
 else
+	{
+	    echo '
+Conflicts:
+'
+		git ls-files --unmerged |
+		sed -e 's/^[^	]*	/	/' |
+		uniq
+	} >>"$GIT_DIR/MERGE_MSG"
+	if test -d "$GIT_DIR/rr-cache"
+	then
+		git-rerere
+	fi
 	die "Automatic merge failed; fix up by hand"
 fi