summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorTom Clarke <tom@u2i.com>2007-08-30 21:12:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-31 00:18:22 (GMT)
commit7d3c82a7610ac9ba11a26e1e594e48e0ebef629a (patch)
tree5a596ff963b44c62d9b6a115dca3751120c25df1 /git-merge-stupid.sh
parent93e23fea2d7538ac24e35b50984dbbbb84d89f9a (diff)
downloadgit-7d3c82a7610ac9ba11a26e1e594e48e0ebef629a.zip
git-7d3c82a7610ac9ba11a26e1e594e48e0ebef629a.tar.gz
git-7d3c82a7610ac9ba11a26e1e594e48e0ebef629a.tar.bz2
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>
Diffstat (limited to 'git-merge-stupid.sh')
-rwxr-xr-xgit-merge-stupid.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh
index 4b1e595..f612d47 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 ;;