--- a/tests/test-histedit-fold.t Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-histedit-fold.t Fri May 09 14:46:50 2014 -0500
@@ -217,7 +217,7 @@
U file
$ hg revert -r 'p1()' file
$ hg resolve --mark file
- no unresolved files; you may continue your unfinished operation
+ 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 unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg commit -m '+5.2'
created new head
$ echo 6 >> file