--- a/tests/test-divergent.t	Tue May 22 20:33:42 2018 +0530
+++ b/tests/test-divergent.t	Mon Apr 23 14:48:53 2018 +0530
@@ -60,9 +60,9 @@
   updating to "local" side of the conflict: c2f698071cba
   merging "other" content-divergent changeset 'e708fd28d5cf'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at c26f1d3baed2
+  working directory is now at c9708170cf11
   $ hg log -G
-  @  4:c26f1d3baed2@default(draft) add bdivergent1 []
+  @  4:c9708170cf11@default(draft) add bdivergent1 []
   |
   o  0:135f39f4bd78@default(draft) add _a []
   
@@ -94,7 +94,7 @@
   |
   | *  6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
   |/
-  | o  4:c26f1d3baed2@default(draft) add bdivergent1 []
+  | o  4:c9708170cf11@default(draft) add bdivergent1 []
   |/
   o  0:135f39f4bd78@default(draft) add _a []
   
@@ -154,7 +154,7 @@
   base: [1] add _b
   merging "other" content-divergent changeset 'c2f698071cba'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at aa26817f6fbe
+  working directory is now at 1ed713bcebf6
 
 
   $ cd ..