diff -r 0aca2695a110 -r 6c8573dd1b6b tests/test-merge-force.t
--- a/tests/test-merge-force.t	Wed Dec 07 11:22:57 2011 -0600
+++ b/tests/test-merge-force.t	Wed Dec 07 11:23:01 2011 -0600
@@ -19,7 +19,8 @@
 Should fail, since there are deleted files:
 
   $ hg merge
-  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  abort: outstanding uncommitted changes
+  (use 'hg status' to list changes)
   [255]
 
 Should succeed with --force: