remove merge-recursive-old

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

index a9cfafb1dfba6e85834a33caf6b3c69910594bf6..84c3acfe63081b1c10ec171fa10246e0330efac8 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,17 +9,13 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recursive 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='resolve octopus stupid ours'
-       default_twohead_strategies='resolve'
-fi
  
  dropsave() {
         rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@@ -94,6 +90,8 @@ finish () {
         esac
  }
  
+case "$#" in 0) usage ;; esac
+
  rloga=
  while case "$#" in 0) break ;; esac
  do
@@ -198,7 +196,7 @@ f,*)
         ;;
  ?,1,"$head",*)
         # Again the most common case of merging one remote.
-       echo "Updating from $head to $1"
+       echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
         git-update-index --refresh 2>/dev/null
         new_head=$(git-rev-parse --verify "$1^0") &&
         git-read-tree -u -v -m $head "$new_head" &&