--- a/tests/test-evolve-stop-orphan.t Tue Sep 18 02:14:10 2018 +0200
+++ b/tests/test-evolve-stop-orphan.t Fri Sep 21 15:52:53 2018 +0530
@@ -242,9 +242,7 @@
move:[1] added a
atop:[7] added hgignore
move:[2] added b
- atop:[8] added a
move:[5] added c
- atop:[9] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -357,7 +355,6 @@
move:[9] added b
atop:[12] added a
move:[10] added c
- atop:[13] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`