tests/test-mq-qnew.t
branchstable
changeset 21947 b081decd9062
parent 21930 a5168eb9b2bc
child 22519 c87f2a5a6e49
--- a/tests/test-mq-qnew.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-mq-qnew.t	Sat Jul 26 03:32:49 2014 +0200
@@ -158,7 +158,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  no more unresolved files
+  (no more unresolved files)
   abort: cannot manage merge changesets
   $ rm -r sandbox
 
@@ -232,7 +232,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  no more unresolved files
+  (no more unresolved files)
   abort: cannot manage merge changesets
   $ rm -r sandbox