--- a/tests/test-evolve-content-divergence.t	Fri Mar 22 00:16:44 2019 +0530
+++ b/tests/test-evolve-content-divergence.t	Sat Mar 23 02:10:31 2019 +0530
@@ -1075,32 +1075,35 @@
   merging "other" content-divergent changeset '186bdc2cdfa2'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   6 new orphan changesets
-  merge:[6] added b
-  with: [11] added b
+  merge:[11] added b
+  with: [6] added b
   base: [2] added b
-  updating to "local" side of the conflict: d5f148423c16
-  merging "other" content-divergent changeset '6eb54b5af3fb'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  merge:[7] added c
-  with: [12] added c
+  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
-  updating to "local" side of the conflict: 3ce4be6d8e5e
-  merging "other" content-divergent changeset '8ed612937375'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  merge:[8] added d
-  with: [13] added d
+  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
-  updating to "local" side of the conflict: c72d2885eb51
-  merging "other" content-divergent changeset 'd45f050514c2'
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at c8f73c376a6e
+  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 5f7a38bdb75c
 
   $ hg glog
-  @  18:c8f73c376a6e added d
+  @  21:5f7a38bdb75c added d
   |   () [default] draft
-  o  17:77126af93a25 added c
+  o  19:9865d598f0e0 added c
   |   () [default] draft
-  o  16:4e29776e83a5 added b
+  o  17:ac70b8c8eb63 added b
   |   () [default] draft
   o  15:74fbf3e6a0b6 watbar to a
   |   () [default] draft