undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing comment in merge strategies

Browse Source 
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:
Tom Clarke 2007-08-30 23:12:44 +02:00 committed by Junio C Hamano
parent 93e23fea2d
commit 7d3c82a761
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-resolve.sh
View File

@ -25,7 +25,7 @@ do
esac esac
done 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 case "$remotes" in
?*' '?*) ?*' '?*)
exit 2 ;; exit 2 ;;

2
git-merge-stupid.sh
View File

@ -24,7 +24,7 @@ do
esac esac
done 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 case "$remotes" in
?*' '?*) ?*' '?*)
exit 2 ;; exit 2 ;;