From 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a Mon Sep 17 00:00:00 2001 From: Tom Clarke Date: Thu, 30 Aug 2007 23:12:44 +0200 Subject: [PATCH] Fixing comment in merge strategies Comments in both these strategies refer to the wrong number of remotes Signed-off-by: Tom Clarke Signed-off-by: Junio C Hamano --- git-merge-resolve.sh | 2 +- 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 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 ;; -- 2.30.2