diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-20 11:49:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-22 07:55:39 +0300 |
| commit | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch) | |
| tree | 14d84fbaf70277d8ba833391c03860e98c1defe7 /git-merge.sh | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
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-x | git-merge.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-merge.sh b/git-merge.sh index cb094388bb..84c3acfe63 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" \ |