aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index ee6886f30..98b9215f7 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
}