changeset 3702 | f6979d64b9fb |
parent 3494 | 14cd04ff968e |
child 3714 | 19ec729f3ca2 |
child 3796 | ededd22e7c7b |
--- a/tests/test-evolve-phase.t Thu Apr 19 16:27:13 2018 +0200 +++ b/tests/test-evolve-phase.t Sun Apr 22 11:40:17 2018 +0200 @@ -87,7 +87,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255]