--- a/tests/test-rebase-conflicts.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-conflicts.t	Fri May 09 14:46:50 2014 -0500
@@ -77,7 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)