diff options
| -rwxr-xr-x | git-merge-resolve.sh | 2 | ||||
| -rwxr-xr-x | git-merge-stupid.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index bb19da2cc1..93bcfc2f5d 100755 --- 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 ;; diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh index 4b1e595363..f612d4729c 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 ;; |