changeset 3796 | ededd22e7c7b |
parent 3747 | 1e103c7f7663 |
child 3821 | f67ac33c07d2 |
--- a/tests/test-evolve.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve.t Wed Jun 06 04:09:49 2018 +0530 @@ -1536,7 +1536,7 @@ merging newfile warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]