branch | mercurial-4.3 |
changeset 3106 | a867d59ea97a |
parent 3105 | f5d472b7e800 |
child 3108 | 9c9c8c1eeb93 |
child 3166 | e1a230cc4527 |
--- a/tests/test-sharing.t Fri Oct 20 19:32:18 2017 +0200 +++ b/tests/test-sharing.t Fri Oct 20 20:04:13 2017 +0200 @@ -494,7 +494,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers (run 'hg heads' to see heads, 'hg merge' to merge) - 2 new content-divergent changesets + 2 new divergent changesets Figure SG09: multiple heads! divergence! oh my! $ hg --hidden shortlog -G -r 3::