Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
format-patch: pretty-print timestamp correctly.
[gitweb.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index dc17baf6e0017b99f94fd9b462ce7243d1fbe0e0..74f07610fa2042ef0f2cb12c051d3be9139a680b 100755
(executable)
--- 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