1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh
index a784e0f2cc..818e6b772d 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -12,9 +12,9 @@ usage () {
     die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+"
 }
 
-# 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"