diff -r 36d559ca5332 -r 883e75e0a810 tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Thu Oct 25 11:32:43 2018 +0200
+++ b/tests/test-topic-stack-complex.t	Wed Oct 17 14:47:38 2018 +0200
@@ -168,3 +168,12 @@
   s2: split1
   s1: Added a and b
   s0^ Added foo (base)
+
+  $ hg evolve --content-divergent -r ec94a1ed1330
+  merge:[s5] Added e and f
+  with: [s4] Added e and f
+  base: [s] Added e and f
+  updating to "local" side of the conflict: ec94a1ed1330
+  merging "other" content-divergent changeset 'f2eff98490d2'
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  working directory is now at 8faad6276dc6