diff options
| author | Tom Clarke <tom@u2i.com> | 2007-08-30 23:12:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-30 17:18:22 -0700 |
| commit | 7d3c82a7610ac9ba11a26e1e594e48e0ebef629a (patch) | |
| tree | 5a596ff963b44c62d9b6a115dca3751120c25df1 | |
| parent | 93e23fea2d7538ac24e35b50984dbbbb84d89f9a (diff) | |
| download | git-7d3c82a7610ac9ba11a26e1e594e48e0ebef629a.tar.gz | |
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>
| -rwxr-xr-x | git-merge-resolve.sh | 2 | ||||
| -rwxr-xr-x | git-merge-stupid.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh index bb19da2cc1..93bcfc2f5d 100755 --- a/git-merge-resolve.sh +++ b/git-merge-resolve.sh @@ -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 ;; diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh index 4b1e595363..f612d4729c 100755 --- a/git-merge-stupid.sh +++ b/git-merge-stupid.sh @@ -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 ;; |