summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-20 08:49:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-22 04:55:39 (GMT)
commit7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch)
tree14d84fbaf70277d8ba833391c03860e98c1defe7 /git-merge.sh
parent594270635732d6320d6e6d7fa127679ae90ef5b1 (diff)
downloadgit-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.zip
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz
git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.bz2
remove merge-recursive-old
This frees the Porcelain-ish that comes with the core Python-free. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh
index cb09438..84c3acf 100755
--- 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" \