Andrew's git / gitweb.git / blobdiff
?
Merge branch 'cc/branch-test'
[gitweb.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh
index a9cfafb1dfba6e85834a33caf6b3c69910594bf6..5b34b4de99c33a99dfb841795baced8889f74a88 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,7 +9,7 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
 LF='
 '
 
-all_strategies='recursive octopus resolve stupid ours'
+all_strategies='recur recursive recursive-old octopus resolve stupid ours'
 default_twohead_strategies='recursive'
 default_octopus_strategies='octopus'
 no_trivial_merge_strategies='ours'
@@ -17,8 +17,7 @@ use_strategies=
 
 index_merge=t
 if test "@@NO_PYTHON@@"; then
-       all_strategies='resolve octopus stupid ours'
-       default_twohead_strategies='resolve'
+       all_strategies='recur recursive resolve octopus stupid ours'
 fi
 
 dropsave() {