git-rerere: reuse recorded resolve.

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c..dc17baf 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -309,5 +309,6 @@ Conflicts:
                sed -e 's/^[^   ]*      /       /' |
                uniq
        } >>"$GIT_DIR/MERGE_MSG"
+       git rerere
        die "Automatic merge failed; fix up by hand"
 fi