tests/test-sharing.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4516 f54bb6eaf5e6
parent 4672 653c42af172e
--- a/tests/test-sharing.t	Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-sharing.t	Wed Jun 05 17:56:44 2019 +0200
@@ -485,13 +485,12 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  2 new content-divergent changesets
   new changesets e3f99ce9d9cd
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
-  *  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+  o  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   |
   | @  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
   |/