@matheusbsbs / matheus-bagliano / commits / 7d3c82a761
Fork 0

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>

Tom Clarke committed Aug 30, 2007 at 23:12 UTC 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a
2 files changed +2 -2
git-merge-resolve.sh
+1 -1
@@ -25,7 +25,7 @@ do
25 esac
26 done
27
28 -# Give up if we are given more than two remotes -- not handling octopus.
28 +# Give up if we are given two or more remotes -- not handling octopus.
29 case "$remotes" in
30 ?*' '?*)
31 exit 2 ;;
git-merge-stupid.sh
+1 -1
@@ -24,7 +24,7 @@ do
24 esac
25 done
26
27 -# Give up if we are given more than two remotes -- not handling octopus.
27 +# Give up if we are given two or more remotes -- not handling octopus.
28 case "$remotes" in
29 ?*' '?*)
30 exit 2 ;;