diff -r 584bbfd1b50d -r 6c36dc6cd61a tests/test-rebase-mq.t --- a/tests/test-rebase-mq.t Sat Jul 12 02:23:17 2014 -0700 +++ b/tests/test-rebase-mq.t Sat Jul 19 00:10:22 2014 -0500 @@ -69,6 +69,7 @@ $ echo mq1r1 > f $ hg resolve -m f + no more unresolved files $ hg rebase -c merging f warning: conflicts during merge. @@ -80,6 +81,7 @@ $ echo mq1r1mq2 > f $ hg resolve -m f + no more unresolved files $ hg rebase -c saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)