--- a/tests/test-rebase-bookmarks.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-bookmarks.t	Fri May 09 14:46:50 2014 -0500
@@ -168,7 +168,7 @@
   [1]
   $ echo 'c' > c
   $ hg resolve --mark c
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
   $ hg tglog