diff --git a/git-merge.sh b/git-merge.sh
index a9cfafb1dfba6e85834a33caf6b3c69910594bf6..789f4de595d2657c9c348b4d52b47e2c42543ad2 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
LF='
'
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'
default_twohead_strategies='recursive'
default_octopus_strategies='octopus'
no_trivial_merge_strategies='ours'
index_merge=t
if test "@@NO_PYTHON@@"; then
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() {
fi
dropsave() {
esac
}
esac
}
+case "$#" in 0) usage ;; esac
+
rloga=
while case "$#" in 0) break ;; esac
do
rloga=
while case "$#" in 0) break ;; esac
do