diff -r 232de244ab6f -r 19d6fec60b81 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-rebase-conflicts.t	Fri Apr 18 22:19:25 2014 -0700
@@ -77,6 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
+  no unresolved files; you may continue your unfinished operation
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)