Fix off-by-one error in git-merge

'git-merge -s' without a strategy name does not fail and does
not give usage as it should.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-merge.sh b/git-merge.sh
index a784e0f2cc5935a68795cb9f5ecf1b13716477f6..e51e73499a1cf65cec94ed7f0134e3abc72435a6 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -43,7 +43,7 @@ do
                case "$#,$1" in
                *,*=*)
                        strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
-               0,*)
+               1,*)
                        usage ;;
                *)
                        strategy="$2"