diff -r eea339cf4d30 -r 4eb3877540f1 tests/test-evolve-abort-orphan.t --- a/tests/test-evolve-abort-orphan.t Tue Sep 18 02:14:10 2018 +0200 +++ b/tests/test-evolve-abort-orphan.t Fri Sep 21 15:52:53 2018 +0530 @@ -157,7 +157,6 @@ move:[2] added b atop:[7] added a move:[5] added c - atop:[8] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted` @@ -485,7 +484,6 @@ move:[2] added b atop:[4] added a move:[3] added c - atop:[5] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') fix conflicts and see `hg help evolve.interrupted`