diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-24 19:49:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 20:33:35 -0700 |
| commit | a06f678eb998862ea83b73e46ece32f99132935b (patch) | |
| tree | d7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5 /t | |
| parent | 8391548e5e78677eb81f97334d998418802ea194 (diff) | |
| download | git-a06f678eb998862ea83b73e46ece32f99132935b.tar.gz git-a06f678eb998862ea83b73e46ece32f99132935b.tar.xz | |
Deprecate merge-recursive.py
This renames merge-recursive written in Python to merge-recursive-old,
and makes merge-recur as a synonym to merge-recursive. We do not remove
merge-recur yet, but we will remove merge-recur and merge-recursive-old
in a few releases down the road.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/test-lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index e75ad5faa..0fe271884 100755 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -211,7 +211,7 @@ export PATH GIT_EXEC_PATH PYTHON=`sed -e '1{ s/^#!// q -}' ../git-merge-recursive` || { +}' ../git-merge-recursive-old` || { error "You haven't built things yet, have you?" } "$PYTHON" -c 'import subprocess' 2>/dev/null || { |