Andrew's git / gitweb.git / blobdiff
?
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[gitweb.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh
index e51e73499a1cf65cec94ed7f0134e3abc72435a6..818e6b772d30c060020640deb051f2428e2c9fe5 100755 (executable)
--- 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=