tests/test-merge1.t
changeset 15619 6c8573dd1b6b
parent 15243 1e9451476bf8
child 15894 44fa047cef57
--- a/tests/test-merge1.t	Wed Dec 07 11:22:57 2011 -0600
+++ b/tests/test-merge1.t	Wed Dec 07 11:23:01 2011 -0600
@@ -108,7 +108,8 @@
   $ echo This is file b22 > b
 merge fails
   $ hg merge 2
-  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  abort: outstanding uncommitted changes
+  (use 'hg status' to list changes)
   [255]
 merge expected!
   $ hg merge -f 2
@@ -144,7 +145,8 @@
   $ echo This is file b33 > b
 merge of b should fail
   $ hg merge 2
-  abort: outstanding uncommitted changes (use 'hg status' to list changes)
+  abort: outstanding uncommitted changes
+  (use 'hg status' to list changes)
   [255]
 merge of b expected
   $ hg merge -f 2