Merge branches 'jc/nostat' and 'jc/empty-commit'

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c147f6e32a8870f24bd007204bcbc01064..dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0 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