changeset 44347 | 9c9cfecd4600 |
parent 44239 | 830eae18b2f3 |
child 44555 | 05654ea5137c |
--- a/tests/test-rebase-parameters.t Fri Jan 10 14:17:56 2020 -0800 +++ b/tests/test-rebase-parameters.t Fri Jan 10 14:22:20 2020 -0800 @@ -481,11 +481,9 @@ $ hg summary parent: 1:56daeba07f4b c2 - parent: 2:e4e3f3546619 tip - c2b branch: default - commit: 1 modified, 1 unresolved (merge) - update: (current) + commit: 1 unresolved (clean) + update: 1 new changesets, 2 branch heads (merge) phases: 3 draft rebase: 0 rebased, 1 remaining (rebase --continue)