Merge branch 'cc/branch-test'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index e75ad5faace6e40e7f6f3f47e9be90b0e9c4691e..0fe2718845fa8ad66dfa850ac2921e33b10b51c1 100755 (executable)
--- 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 || {