X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge.sh;h=818e6b772d30c060020640deb051f2428e2c9fe5;hb=0de68d28d34f915951324b9f387e6e67172e9951;hp=a784e0f2cc5935a68795cb9f5ecf1b13716477f6;hpb=720d150c48fc35fca13c6dfb3c76d60e4ee83b87;p=git.git diff --git a/git-merge.sh b/git-merge.sh index a784e0f2..818e6b77 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,9 +12,9 @@ usage () { die "git-merge [-n] [-s ]... +" } -# all_strategies='resolve fredrik stupid octopus' +# all_strategies='resolve recursive stupid octopus' -all_strategies='fredrik octopus resolve stupid' +all_strategies='recursive octopus resolve stupid' default_strategies='resolve octopus' use_strategies= @@ -43,7 +43,7 @@ do case "$#,$1" in *,*=*) strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; - 0,*) + 1,*) usage ;; *) strategy="$2"