projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Random documentation fixes
[git.git]
/
git-merge-resolve.sh
diff --git
a/git-merge-resolve.sh
b/git-merge-resolve.sh
index
e3b04a0
..
966e81f
100755
(executable)
--- a/
git-merge-resolve.sh
+++ b/
git-merge-resolve.sh
@@
-31,6
+31,12
@@
case "$remotes" in
exit 2 ;;
esac
+# Give up if this is a baseless merge.
+if test '' = "$bases"
+then
+ exit 2
+fi
+
git-update-index --refresh 2>/dev/null
git-read-tree -u -m $bases $head $remotes || exit 2
echo "Trying simple merge."