summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-merge-resolve.sh')
-rwxr-xr-xgit-merge-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index bb19da2..93bcfc2 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 ;;