git merge: reword failure message.

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 450fee89973af5fa660b43202e8945b55e01cf6f..63c670304f0241d93c8a1661080735ca4a14258a 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -11,8 +11,15 @@ GIT_DIR=$PWD/.git
 GIT_SVN_DIR=$GIT_DIR/svn/git-svn
 SVN_TREE=$GIT_SVN_DIR/svn-tree
 
+perl -e 'use SVN::Core' >/dev/null 2>&1
+if test $? -ne 0
+then
+   echo 'Perl SVN libraries not found, tests requiring those will be skipped'
+   GIT_SVN_NO_LIB=1
+fi
+
 svnadmin >/dev/null 2>&1
-if test $? != 1
+if test $? -ne 1
 then
     test_expect_success 'skipping git-svn tests, svnadmin not found' :
     test_done
@@ -20,7 +27,7 @@ then
 fi
 
 svn >/dev/null 2>&1
-if test $? != 1
+if test $? -ne 1
 then
     test_expect_success 'skipping git-svn tests, svn not found' :
     test_done
@@ -38,6 +45,6 @@ else
        svnadmin create "$svnrepo"
 fi
 
-svnrepo="file://$svnrepo/test-git-svn"
+svnrepo="file://$svnrepo"