--- a/tests/test-evolve-content-divergent-basic.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Fri Apr 26 01:20:08 2019 +0530
@@ -139,8 +139,6 @@
   merge:[2] divergent
   with: [3] divergent
   base: [1] added b
-  updating to "local" side of the conflict: 593c57f2117e
-  merging "other" content-divergent changeset '8374d2ddc3a4'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 45bf1312f454
   $ hg log -G
@@ -237,7 +235,6 @@
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset '9e5dffcb3d48'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
@@ -292,7 +289,6 @@
   merge:[9] added a d with bar in it, expect some beers
   with: [8] added d
   base: [7] added d
-  merging "other" content-divergent changeset 'f621d00f5f0e'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at a9d6fd6b5e40
 
@@ -341,7 +337,6 @@
   merge:[12] foo to d
   with: [11] foo to d
   base: [10] added a d with bar in it, expect some beers
-  merging "other" content-divergent changeset 'b10b07a394f1'
   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
@@ -401,7 +396,6 @@
   merge:[15] wat to d, wat?
   with: [14] bar to d, expect beers
   base: [13] foo to d
-  merging "other" content-divergent changeset '27f0463f169a'
   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
@@ -612,7 +606,6 @@
   merge:[6] More addition (2)
   with: [4] More addition
   base: [1] More addition
-  merging "other" content-divergent changeset '5bf84d1d71d1'
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -960,8 +953,6 @@
   merge:[2] E2
   with: [3] E3
   base: [1] E1
-  updating to "local" side of the conflict: 084ae625fa51
-  merging "other" content-divergent changeset '19ed1bf64a2c'
   merging numbers
   merging romans
   1 files updated, 2 files merged, 0 files removed, 0 files unresolved