remove merge-recursive-old

[git.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh

index cb094388bb5c830d37a790f5e7bbf13e8c61352a..84c3acfe63081b1c10ec171fa10246e0330efac8 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,16 +9,13 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recur recursive recursive-old octopus resolve stupid ours'
+all_strategies='recur recursive octopus resolve stupid ours'
  default_twohead_strategies='recursive'
  default_octopus_strategies='octopus'
  no_trivial_merge_strategies='ours'
  use_strategies=
  
  index_merge=t
-if test "@@NO_PYTHON@@"; then
-       all_strategies='recur recursive resolve octopus stupid ours'
-fi
  
  dropsave() {
         rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \