tests/test-sharing.t
branchmercurial-4.4
changeset 4173 e268f7fd7839
parent 3930 d00f0c369bc7
parent 4165 ccbfbeee6cf3
child 4174 e07e764c0f48
child 4206 04aeaec6ec07
--- a/tests/test-sharing.t	Fri Oct 12 15:15:07 2018 +0200
+++ b/tests/test-sharing.t	Fri Oct 12 15:15:09 2018 +0200
@@ -485,13 +485,13 @@
   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)
+  2 new content-divergent changesets
 
 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)
   |/