changeset 3821 | f67ac33c07d2 |
parent 3796 | ededd22e7c7b |
child 3843 | f0096db2a7b1 |
--- a/tests/test-evolve-phase.t Thu Jun 07 22:59:39 2018 +0530 +++ b/tests/test-evolve-phase.t Mon Jun 11 01:12:12 2018 +0530 @@ -87,7 +87,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! - see `hg help evolve.interrupted-evolve` + see `hg help evolve.interrupted` abort: unresolved merge conflicts (see hg help resolve) [255]