projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
rev-list --objects-edge
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
8c0a92c
..
74f0761
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-309,5
+309,9
@@
Conflicts:
sed -e 's/^[^ ]* / /' |
uniq
} >>"$GIT_DIR/MERGE_MSG"
+ if test -d "$GIT_DIR/rr-cache"
+ then
+ git-rerere
+ fi
die "Automatic merge failed; fix up by hand"
fi