Browse Source

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>
maint
Tom Clarke 18 years ago committed by Junio C Hamano
parent
commit
7d3c82a761
  1. 2
      git-merge-resolve.sh
  2. 2
      git-merge-stupid.sh

2
git-merge-resolve.sh

@ -25,7 +25,7 @@ do @@ -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 ;;

2
git-merge-stupid.sh

@ -24,7 +24,7 @@ do @@ -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 ;;

Loading…
Cancel
Save