--- a/tests/test-divergent.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-divergent.t	Sun Apr 29 19:18:54 2018 +0530
@@ -58,6 +58,7 @@
   with: [3] add bdivergent2
   base: [1] add _b
   updating to "local" side of the conflict: c2f698071cba
+  merging "other" content-divergent changeset 'e708fd28d5cf'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at c26f1d3baed2
   $ hg log -G
@@ -102,6 +103,7 @@
   with: [7] cdivergent2
   base: [5] add _c
   updating to "local" side of the conflict: 26c7705fee96
+  merging "other" content-divergent changeset '0a768ef678d9'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at 26c7705fee96
@@ -150,6 +152,7 @@
   merge:[3] add bdivergent2
   with: [2] add bdivergent1
   base: [1] add _b
+  merging "other" content-divergent changeset 'c2f698071cba'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at aa26817f6fbe