summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 8c0a92c..dc17baf 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -309,5 +309,6 @@ Conflicts:
sed -e 's/^[^ ]* / /' |
uniq
} >>"$GIT_DIR/MERGE_MSG"
+ git rerere
die "Automatic merge failed; fix up by hand"
fi