diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index dc17baf6e0..74f07610fa 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -309,6 +309,9 @@ Conflicts: sed -e 's/^[^ ]* / /' | uniq } >>"$GIT_DIR/MERGE_MSG" - git rerere + if test -d "$GIT_DIR/rr-cache" + then + git-rerere + fi die "Automatic merge failed; fix up by hand" fi |