tests/test-histedit-fold-non-commute.t
branchstable
changeset 21947 b081decd9062
parent 21267 e4f451c8c05c
child 22152 d2a5986cb89d
--- a/tests/test-histedit-fold-non-commute.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-fold-non-commute.t	Sat Jul 26 03:32:49 2014 +0200
@@ -95,7 +95,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ cat > cat.py <<EOF
   > import sys
   > print open(sys.argv[1]).read()
@@ -130,7 +130,7 @@
 just continue this time
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved