From: Tom Clarke <tom@u2i.com>
Date: Thu, 30 Aug 2007 21:12:44 +0000 (+0200)
Subject: Fixing comment in merge strategies
X-Git-Tag: v1.5.3~27
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7d3c82a7610ac9ba11a26e1e594e48e0ebef629a;p=git.git

Fixing comment in merge strategies

Comments in both these strategies refer to the wrong number
of remotes

Signed-off-by: Tom Clarke <tom@u2i.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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 ;;
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 ;;