changeset 19213 | f324a9b8d4bf |
parent 18935 | e5d9441ec281 |
child 19214 | 0250047a365e |
--- a/tests/test-rebase-parameters.t Tue May 14 11:23:16 2013 -0700 +++ b/tests/test-rebase-parameters.t Tue May 14 11:23:17 2013 -0700 @@ -419,6 +419,15 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] + $ hg summary + parent: 1:56daeba07f4b + c2 + parent: 2:e4e3f3546619 tip + c2b + branch: default + commit: 1 modified, 1 unresolved (merge) + update: (current) + $ hg resolve -l U c2