tests/test-rebase-mq.t
changeset 21266 19d6fec60b81
parent 20117 aa9385f983fa
child 21267 e4f451c8c05c
--- a/tests/test-rebase-mq.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-rebase-mq.t	Fri Apr 18 22:19:25 2014 -0700
@@ -69,6 +69,7 @@
 
   $ echo mq1r1 > f
   $ hg resolve -m f
+  no unresolved files; you may continue your unfinished operation
   $ hg rebase -c
   merging f
   warning: conflicts during merge.
@@ -80,6 +81,7 @@
 
   $ echo mq1r1mq2 > f
   $ hg resolve -m f
+  no unresolved files; you may continue your unfinished operation
   $ hg rebase -c
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)