diff -r 2a7f89817540 -r 18d5a7525c2c tests/test-topic-stack-complex.t
--- a/tests/test-topic-stack-complex.t	Thu Oct 25 13:03:30 2018 +0200
+++ b/tests/test-topic-stack-complex.t	Thu Oct 25 18:32:50 2018 +0200
@@ -172,7 +172,7 @@
   $ hg evolve --content-divergent -r ec94a1ed1330
   merge:[s5] Added e and f
   with: [s4] Added e and f
-  base: [s] Added e and f
+  base: [3] 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