changeset 3853 | 796334340cad |
parent 3852 | 629558d09898 |
child 3909 | f7afd3a158e3 |
child 3976 | d081528bb372 |
--- a/tests/test-evolve-abort-contentdiv.t Fri Jun 15 00:16:29 2018 +0530 +++ b/tests/test-evolve-abort-contentdiv.t Fri Jun 15 00:50:17 2018 +0530 @@ -283,8 +283,8 @@ rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg evolve --abort evolve aborted