diff -r 19d6fec60b81 -r e4f451c8c05c tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-parameters.t	Fri May 09 14:46:50 2014 -0500
@@ -454,7 +454,7 @@
   U c2
 
   $ hg resolve -m c2
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase -c --tool internal:fail
   tool option will be ignored
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob)