Merge branch 'jc/rebase-limit'

diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c147f6e32a8870f24bd007204bcbc01064..74f07610fa2042ef0f2cb12c051d3be9139a680b 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -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