Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Move pack_refs() and friends into libgit
[gitweb.git]
/
git-merge-resolve.sh
diff --git
a/git-merge-resolve.sh
b/git-merge-resolve.sh
index bb19da2cc15715df9c96ddea18c6d449ce49b6e4..93bcfc2f5dce418d00f26257788932d5c738785c 100755
(executable)
--- a/
git-merge-resolve.sh
+++ b/
git-merge-resolve.sh
@@
-25,7
+25,7
@@
do
esac
done
-# Give up if we are given
more than two
remotes -- not handling octopus.
+# Give up if we are given
two or more
remotes -- not handling octopus.
case "$remotes" in
?*' '?*)
exit 2 ;;