Mercurial > public > mercurial-scm > hg

diff tests/test-merge-types @ 5683:396c7010b0cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use common readlink.py instead of own implementations per test script.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 21 Dec 2007 10:24:03 +0100
parents 048889f8c7d1
children 57d29a45ffbc
line wrap: on
line diff
--- a/tests/test-merge-types	Fri Dec 21 09:51:19 2007 +0100
+++ b/tests/test-merge-types	Fri Dec 21 10:24:03 2007 +0100
@@ -18,7 +18,7 @@
 
 if [ -h a ]; then
     echo a is a symlink
-    readlink a
+    $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
 fi
@@ -30,7 +30,7 @@
 
 if [ -h a ]; then
     echo a is a symlink
-    readlink a
+    $TESTDIR/readlink.py a
 elif [ -x a ]; then
     echo a is executable
 fi