X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=74f07610fa2042ef0f2cb12c051d3be9139a680b;hb=8e1618f9612a78ea09b2a926797c781fe06027c9;hp=92e5a65cae6ebe8d9f9eef71277240e3fbe72315;hpb=6b94f1e404afc552e5139c4357331843f5be61ad;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65c..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
@@ -309,5 +309,9 @@ Conflicts:
 		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