summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 4852530..5ccf282 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -496,9 +496,6 @@ Conflicts:
sed -e 's/^[^ ]* / /' |
uniq
} >>"$GIT_DIR/MERGE_MSG"
- if test -d "$GIT_DIR/rr-cache"
- then
- git rerere
- fi
+ git rerere
die "Automatic merge failed; fix conflicts and then commit the result."
fi