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