X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;fp=git-merge.sh;h=dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0;hb=8389b52b2a51d5b110b508cc67f0f41f99c30d3f;hp=8c0a92c147f6e32a8870f24bd007204bcbc01064;hpb=1cb303872ab1ba73fcc52167c61fc4211c843cf5;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c1..dc17baf6 100755
--- 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