--- a/tests/test-evolve-content-divergent-stack.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-stack.t	Fri Apr 26 01:20:08 2019 +0530
@@ -143,25 +143,18 @@
   merge:[5] watbar to a
   with: [9] watbar to a
   base: [1] added a
-  merging "other" content-divergent changeset '82b74d5dc678'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[6] added b
   with: [10] added b
   base: [2] added b
-  updating to "local" side of the conflict: d5f148423c16
-  merging "other" content-divergent changeset '88516dccf68a'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[7] added c
   with: [11] added c
   base: [3] added c
-  updating to "local" side of the conflict: 3ce4be6d8e5e
-  merging "other" content-divergent changeset '9e5fb1d5b955'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[8] added d
   with: [12] added d
   base: [4] added d
-  updating to "local" side of the conflict: c72d2885eb51
-  merging "other" content-divergent changeset '15c781f93cac'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at f66f262fff6c
 
@@ -318,29 +311,21 @@
   with: [5] watbar to a
   base: [1] added a
   rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
-  updating to "local" side of the conflict: c04ff147ef79
-  merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[11] added b
   with: [6] added b
   base: [2] added b
   rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79
-  updating to "local" side of the conflict: 6eb54b5af3fb
-  merging "other" content-divergent changeset '8542f15656e7'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[12] added c
   with: [7] added c
   base: [3] added c
   rebasing "other" content-divergent changeset 3ce4be6d8e5e on 6eb54b5af3fb
-  updating to "local" side of the conflict: 8ed612937375
-  merging "other" content-divergent changeset 'a690ce53104a'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merge:[13] added d
   with: [8] added d
   base: [4] added d
   rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375
-  updating to "local" side of the conflict: d45f050514c2
-  merging "other" content-divergent changeset '1d1772990a3b'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 74fbf3e6a0b6