tests/test-pathconflicts-merge.t

--- a/tests/test-pathconflicts-merge.t	Tue Oct 10 11:02:40 2017 -0400
+++ b/tests/test-pathconflicts-merge.t	Tue Oct 10 11:02:53 2017 -0400
@@ -121,8 +121,8 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg mv a/b~2ea68033e3be a/b.old
-  $ readlink a/b.old
-  c
+  $ readlink.py a/b.old
+  a/b.old -> c
   $ hg resolve --mark a/b
   (no more unresolved files)
   $ hg commit -m "merge link (rename link)"