tests/test-histedit-fold.t
branchstable
changeset 21947 b081decd9062
parent 21267 e4f451c8c05c
child 22147 9ac98c2aa95c
child 22152 d2a5986cb89d
--- a/tests/test-histedit-fold.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-fold.t	Sat Jul 26 03:32:49 2014 +0200
@@ -217,7 +217,7 @@
   U file
   $ hg revert -r 'p1()' file
   $ hg resolve --mark file
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/*-backup.hg (glob)
@@ -277,7 +277,7 @@
   > 5
   > EOF
   $ hg resolve --mark file
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m '+5.2'
   created new head
   $ echo 6 >> file