Merge branch 'lt/diff-tree'

diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65cae6ebe8d9f9eef71277240e3fbe72315..dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0 100755 (executable)
--- 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,6 @@ Conflicts:
                sed -e 's/^[^   ]*      /       /' |
                uniq
        } >>"$GIT_DIR/MERGE_MSG"
+       git rerere
        die "Automatic merge failed; fix up by hand"
 fi