diff -r b8b4ff86feb8 -r ededd22e7c7b tests/test-issue-5720.t --- a/tests/test-issue-5720.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-issue-5720.t Wed Jun 06 04:09:49 2018 +0530 @@ -62,7 +62,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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]