Mercurial > evolve
diff tests/test-sharing.t @ 2856:f6517779a7c4
warning: rename warning message
divergent has been renamed into contentdivergent. Use their renamed
counterpart in warning message for new unstable changesets.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 24 Aug 2017 09:12:09 +0200 |
| parents | f588de9dd067 |
| children | 4b934144ed11 |
line wrap: on
line diff
--- a/tests/test-sharing.t Thu Aug 24 09:11:54 2017 +0200 +++ b/tests/test-sharing.t Thu Aug 24 09:12:09 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 divergent changesets + 2 new contentdivergent changesets Figure SG09: multiple heads! divergence! oh my! $ hg --hidden shortlog -G -r 3::