diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-28 04:41:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-28 04:41:24 (GMT) |
| commit | e38604e00637a7b25c12c0ef1423a6135cbf049b (patch) | |
| tree | c8df7512be7d8d29e4f023947e5de7f55e5c9f48 /t | |
| parent | 07ccbff89b6736a5253e6bba62c9a8e1f2da0ffd (diff) | |
| parent | a06f678eb998862ea83b73e46ece32f99132935b (diff) | |
| download | git-e38604e00637a7b25c12c0ef1423a6135cbf049b.zip git-e38604e00637a7b25c12c0ef1423a6135cbf049b.tar.gz git-e38604e00637a7b25c12c0ef1423a6135cbf049b.tar.bz2 | |
Merge branch 'jc/deprecate-recursive'
* jc/deprecate-recursive:
Deprecate merge-recursive.py
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 e75ad5f..0fe2718 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 || { |