X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hb=810255fd12536d296597a0366f514bf65c2e10f6;hp=731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4;hpb=69224716f78d6a772318e73060a70ba5ae67e55b;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 731ab1ff..98b9215f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -88,6 +88,10 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
+	    if test -d "$GIT_DIR/rr-cache"
+	    then
+		git-rerere
+	    fi
 	    echo Failed to merge in the changes.
 	    exit 1
     }