mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove merge-recursive-old

Browse Source 
This frees the Porcelain-ish that comes with the core Python-free.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-11-20 00:49:31 -08:00
parent 5942706357
commit 7cdbff14d4
14 changed files with 10 additions and 2497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
git-rebase.sh
View File

@ -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