diff -r b78707559f1f -r 61c2518cd6d2 tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Fri Apr 26 01:20:08 2019 +0530
@@ -76,8 +76,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
@@ -137,8 +135,6 @@
   merge:[6] add cdivergent1
   with: [7] add _c
   base: [5] add _c
-  updating to "local" side of the conflict: e3ff64ce8d4c
-  merging "other" content-divergent changeset 'b2ae71172042'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at e3ff64ce8d4c
@@ -207,8 +203,6 @@
   merge:[2] bdivergent
   with: [3] bdivergent
   base: [1] add _b
-  updating to "local" side of the conflict: 05a6b6a9e633
-  merging "other" content-divergent changeset '6b096fb45070'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 73ff357d3975
 
@@ -309,8 +303,6 @@
 
   $ hg evolve --continue
   evolving 6:de4ea3103326 "updated e"
-  updating to "local" side of the conflict: ff6f7cd76a7c
-  merging "other" content-divergent changeset 'e504bd82de7e'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 83b1664a580f
 
@@ -368,8 +360,6 @@
   merge:[2] delete a
   with: [3] delete a
   base: [1] delete a
-  updating to "local" side of the conflict: 0825dcee2670
-  merging "other" content-divergent changeset '92ecd58f9b05'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 7ca6a9fafcf6
   $ hg glog