--- a/tests/test-topic-stack-complex.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-topic-stack-complex.t	Fri Apr 26 01:20:08 2019 +0530
@@ -172,7 +172,5 @@
   merge:[s5] Added e and f
   with: [s4] 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
   working directory is now at 8faad6276dc6