--- a/tests/test-evolve-content-divergent-interrupted.t Sat Nov 23 20:25:16 2019 +0530
+++ b/tests/test-evolve-content-divergent-interrupted.t Sat Nov 23 16:17:04 2019 +0530
@@ -195,6 +195,7 @@
merge:[5] added d
with: [7] added d
base: [4] added d
+ rebasing "divergent" content-divergent changeset e49523854bc8 on ddcf04e1458c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -203,6 +204,7 @@
[1]
$ hg evolve --abort
+ 1 new orphan changesets
2 new content-divergent changesets
evolve aborted
working directory is now at 491e10505bae