diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-20 00:49:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-21 20:55:39 -0800 |
| commit | 7cdbff14d4823c3a3d64c2011ab0b23f794efef8 (patch) | |
| tree | 14d84fbaf70277d8ba833391c03860e98c1defe7 /git-rebase.sh | |
| parent | 594270635732d6320d6e6d7fa127679ae90ef5b1 (diff) | |
| download | git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.gz git-7cdbff14d4823c3a3d64c2011ab0b23f794efef8.tar.xz | |
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-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 546fa446f..25530dfdc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -302,15 +302,6 @@ then exit $? fi -if test "@@NO_PYTHON@@" && test "$strategy" = "recursive-old" -then - die 'The recursive-old merge strategy is written in Python, -which this installation of git was not configured with. Please consider -a different merge strategy (e.g. recursive, resolve, or stupid) -or install Python and git with Python support.' - -fi - # start doing a rebase with git-merge # this is rename-aware if the recursive (default) strategy is used |