X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;fp=git-am.sh;h=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hb=1536dd9c61b5582cf079999057cb715dd6dc6620;hp=ee6886f300f507b26bd8f96a01d30cb7c6d2ee39;hpb=7bbdeaa969794edd67cd4a1ed09b9a057b6af4c3;p=git.git

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