diff -r 07e246deb612 -r ec460882eab7 tests/test-sharing.t
--- a/tests/test-sharing.t	Sun Apr 29 19:14:41 2018 +0530
+++ b/tests/test-sharing.t	Sun Apr 29 19:18:54 2018 +0530
@@ -509,6 +509,7 @@
   merge:[5] fix bug 24 (v2 by bob)
   with: [6] fix bug 24 (v2 by alice)
   base: [4] fix bug 24 (v1)
+  merging "other" content-divergent changeset 'e3f99ce9d9cd'
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
   $ hg log -q -r 'contentdivergent()'