Commit 7d3c82a7 authored by Tom Clarke's avatar Tom Clarke Committed by Junio C Hamano

Fixing comment in merge strategies

Comments in both these strategies refer to the wrong number
of remotes
Signed-off-by: Tom Clarke's avatarTom Clarke <tom@u2i.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 93e23fea
......@@ -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 ;;
......
......@@ -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 ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment