--- a/tests/test-merge1.t	Fri Jan 13 22:16:01 2012 +0100
+++ b/tests/test-merge1.t	Wed Jan 11 15:53:42 2012 -0500
@@ -66,7 +66,8 @@
   $ echo This is file b2 > b
 merge should fail
   $ hg merge 1
-  abort: untracked file in working directory differs from file in requested revision: 'b'
+  b: untracked file differs
+  abort: untracked files in working directory differ from files in requested revision
   [255]
 merge of b expected
   $ hg merge -f 1