changeset 3472 | 05bd493d496d |
parent 3417 | d3a17c67f85c |
child 3494 | 14cd04ff968e |
--- a/tests/test-stabilize-conflict.t Fri Jan 19 19:32:34 2018 +0530 +++ b/tests/test-stabilize-conflict.t Sat Jan 27 21:15:27 2018 +0530 @@ -167,6 +167,7 @@ $ safesed 's/dix/ten/' babar $ hg resolve --all -m (no more unresolved files) + continue: hg evolve --continue $ hg evolve --continue evolving 4:71c18f70c34f "babar count up to fifteen" $ hg resolve -l