X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=818e6b772d30c060020640deb051f2428e2c9fe5;hb=d154dcc8b62ff609a0a3b271e1665c53df5c06a5;hp=55b0c7269e9234a849e4abe7ced5999dbf5334b2;hpb=2276aa6c098a0337bc2bec49742e332bdd1b802c;p=git.git diff --git a/git-merge.sh b/git-merge.sh index 55b0c726..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='resolve octopus 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"