--- a/tests/test-casefolding.t	Fri Jan 13 22:16:01 2012 +0100
+++ b/tests/test-casefolding.t	Wed Jan 11 15:53:42 2012 -0500
@@ -66,7 +66,8 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo gold > a
   $ hg up
-  abort: untracked file in working directory differs from file in requested revision: 'a'
+  a: untracked file differs
+  abort: untracked files in working directory differ from files in requested revision
   [255]
   $ cat a
   gold