Mercurial > evolve

diff tests/test-sharing.t @ 4516:f54bb6eaf5e6 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 11 Apr 2019 22:44:53 +0200
parents a2fdbece7ce1 7a779a288793
children 79bc0f1a832e
line wrap: on
line diff
--- a/tests/test-sharing.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-sharing.t	Thu Apr 11 22:44:53 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)
   |/