зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
93e23fea2d
Коммит
7d3c82a761
|
@ -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 ;;
|
||||
|
|
Загрузка…
Ссылка в новой задаче