--- a/tests/test-sharing.t	Tue May 05 16:29:52 2020 +0800
+++ b/tests/test-sharing.t	Thu Apr 30 10:05:14 2020 -0700
@@ -520,12 +520,12 @@
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-  working directory is now at aa824ceedb8b
+  working directory is now at 0978c15d2db6
   $ hg log -q -r 'contentdivergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::
-  @  7:aa82  draft  fix bug 24 (v2 by bob)
+  @  7:0978  draft  fix bug 24 (v2 by bob)
   |
   | x  6:e3a5  draft  fix bug 24 (v2 by alice)
   |/