Andrew's git / gitweb.git / blobdiff
?
[PATCH] Documentation: Add asciidoc.conf file and gitlink: macro
[gitweb.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh
index 9926e45d1a158c0f4dce1c442afa17fa0de3c94a..818e6b772d30c060020640deb051f2428e2c9fe5 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -12,10 +12,10 @@ usage () {
     die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
 }
 
-# all_strategies='resolve multibase fredrik octopus'
+# all_strategies='resolve recursive stupid octopus'
 
-all_strategies='resolve multibase octopus'
-default_strategies='resolve multibase octopus'
+all_strategies='recursive octopus resolve stupid'
+default_strategies='resolve octopus'
 use_strategies=
 
 dropheads() {
@@ -43,7 +43,7 @@ do
                case "$#,$1" in
                *,*=*)
                        strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
-               0,*)
+               1,*)
                        usage ;;
                *)
                        strategy="$2"