changeset 27626 | 157675d0f600 |
parent 26916 | c7931d8ea29c |
child 30211 | 6b0741d6d234 |
--- a/tests/test-rebase-mq-skip.t Thu Dec 24 20:46:06 2015 +0000 +++ b/tests/test-rebase-mq-skip.t Thu Dec 24 20:41:40 2015 +0000 @@ -155,6 +155,7 @@ $ HGMERGE=internal:local hg resolve --all (no more unresolved files) + continue: hg rebase --continue $ hg rebase --continue already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44