Fix cpio call

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65..74f0761 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,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