--- a/tests/test-rebase-check-restore.t Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-check-restore.t Fri May 09 14:46:50 2014 -0500
@@ -76,7 +76,7 @@
$ echo 'conflict solved' > A
$ rm A.orig
$ hg resolve -m A
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg rebase --continue
$ hg tglog
@@ -130,7 +130,7 @@
$ echo 'conflict solved' > A
$ rm A.orig
$ hg resolve -m A
- no unresolved files; you may continue your unfinished operation
+ no more unresolved files
$ hg rebase --continue
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)