X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=789f4de595d2657c9c348b4d52b47e2c42543ad2;hb=ddaf73141c03aeaab5e8cf5fadaf8b7ebad7955b;hp=a9cfafb1dfba6e85834a33caf6b3c69910594bf6;hpb=2dcb927f37976ef5185cef5452516b170b14cd6c;p=git.git diff --git a/git-merge.sh b/git-merge.sh index a9cfafb1d..789f4de59 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -9,7 +9,7 @@ USAGE='[-n] [--no-commit] [--squash] [-s ]... < 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() { @@ -94,6 +93,8 @@ finish () { esac } +case "$#" in 0) usage ;; esac + rloga= while case "$#" in 0) break ;; esac do