diff -r 5c964ebe4d4b -r f9dad99a90d5 tests/test-divergent.t
--- a/tests/test-divergent.t	Tue Jun 12 23:20:54 2018 +0530
+++ b/tests/test-divergent.t	Wed Jun 13 17:15:10 2018 +0530
@@ -72,9 +72,9 @@
   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 d52878315036
+  working directory is now at 45bf1312f454
   $ hg log -G
-  @  4:d52878315036@default(draft) divergent []
+  @  4:45bf1312f454@default(draft) divergent []
   |
   o  0:9092f1db7931@default(draft) added a []
   
@@ -106,7 +106,7 @@
   |/
   | o  5:48819a835615@default(draft) add _c []
   |/
-  | o  4:d52878315036@default(draft) divergent []
+  | o  4:45bf1312f454@default(draft) divergent []
   |/
   o  0:9092f1db7931@default(draft) added a []
   
@@ -122,7 +122,7 @@
   |
   | *  6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
   |/
-  | o  4:d52878315036@default(draft) divergent []
+  | o  4:45bf1312f454@default(draft) divergent []
   |/
   o  0:9092f1db7931@default(draft) added a []
   
@@ -202,6 +202,6 @@
   base: [1] add _b
   merging "other" content-divergent changeset '05a6b6a9e633'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 1155f059af3f
+  working directory is now at 73ff357d3975
 
   $ cd ..