changeset 21266 | 19d6fec60b81 |
parent 20117 | aa9385f983fa |
child 21267 | e4f451c8c05c |
--- a/tests/test-rebase-mq-skip.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-rebase-mq-skip.t Fri Apr 18 22:19:25 2014 -0700 @@ -111,6 +111,7 @@ [1] $ HGMERGE=internal:local hg resolve --all + no unresolved files; you may continue your unfinished operation $ hg rebase --continue saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)