diff -r 19d6fec60b81 -r e4f451c8c05c tests/test-rebase-mq.t --- a/tests/test-rebase-mq.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-rebase-mq.t Fri May 09 14:46:50 2014 -0500 @@ -69,7 +69,7 @@ $ echo mq1r1 > f $ hg resolve -m f - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg rebase -c merging f warning: conflicts during merge. @@ -81,7 +81,7 @@ $ echo mq1r1mq2 > f $ hg resolve -m f - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg rebase -c saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)