X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge-stupid.sh;h=f612d4729c9ae0ccdebd6b9671da3b5f89bb65f0;hb=b71ce7f3f13ebd0e212bdda82b012ee36df4f63f;hp=4b1e595363cdcfae9d9c567d98127ee83bcc2b23;hpb=4b7f59af2a5b072a0a3950c956842e4d6223a167;p=git.git diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh index 4b1e59536..f612d4729 100755 --- a/git-merge-stupid.sh +++ b/git-merge-stupid.sh @@ -24,7 +24,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 ;;