branch | stable |
changeset 4311 | 8aa28e68ac44 |
parent 4053 | ecbf61d90807 |
child 4313 | 4a740f9eee49 |
child 4454 | f530850c8184 |
child 4481 | d02a7c8cdee5 |
--- a/tests/test-stabilize-result.t Fri Dec 21 19:48:01 2018 +0100 +++ b/tests/test-stabilize-result.t Fri Dec 21 13:14:59 2018 +0800 @@ -93,7 +93,6 @@ +a +newer a $ hg evolve --continue - evolving 4:3655f0f50885 "newer a" abort: unresolved merge conflicts (see 'hg help resolve') [255] $ hg resolve -m a