X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-merge-resolve.sh;h=93bcfc2f5dce418d00f26257788932d5c738785c;hb=847d10f56d7853cd0e139a7c2e6ad0ad2de5c464;hp=bb19da2cc15715df9c96ddea18c6d449ce49b6e4;hpb=b8de7f764e1a9f6e8dfb587a6145906394fa607d;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index bb19da2cc..93bcfc2f5 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 ;;