aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-27 21:41:24 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-27 21:41:24 -0700
commite38604e00637a7b25c12c0ef1423a6135cbf049b (patch)
treec8df7512be7d8d29e4f023947e5de7f55e5c9f48 /t
parent07ccbff89b6736a5253e6bba62c9a8e1f2da0ffd (diff)
parenta06f678eb998862ea83b73e46ece32f99132935b (diff)
downloadgit-e38604e00637a7b25c12c0ef1423a6135cbf049b.tar.gz
git-e38604e00637a7b25c12c0ef1423a6135cbf049b.tar.xz
Merge branch 'jc/deprecate-recursive'
* jc/deprecate-recursive: Deprecate merge-recursive.py
Diffstat (limited to 't')
-rwxr-xr-xt/test-lib.sh2
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 || {