diff -r 868e2cea3ea0 -r b081decd9062 tests/test-merge-types.t
--- a/tests/test-merge-types.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-merge-types.t	Sat Jul 26 03:32:49 2014 +0200
@@ -50,7 +50,7 @@
   a is a symlink:
   a -> symlink
   $ hg resolve a --tool internal:other
-  no more unresolved files
+  (no more unresolved files)
   $ tellmeabout a
   a is an executable file with content:
   a