tests/test-sharing.t
changeset 2856 f6517779a7c4
parent 2843 f588de9dd067
child 2858 4b934144ed11
equal deleted inserted replaced
2855:1db0137297f4 2856:f6517779a7c4
   492   adding manifests
   492   adding manifests
   493   adding file changes
   493   adding file changes
   494   added 1 changesets with 1 changes to 1 files (+1 heads)
   494   added 1 changesets with 1 changes to 1 files (+1 heads)
   495   2 new obsolescence markers
   495   2 new obsolescence markers
   496   (run 'hg heads' to see heads, 'hg merge' to merge)
   496   (run 'hg heads' to see heads, 'hg merge' to merge)
   497   2 new divergent changesets
   497   2 new contentdivergent changesets
   498 
   498 
   499 Figure SG09: multiple heads! divergence! oh my!
   499 Figure SG09: multiple heads! divergence! oh my!
   500   $ hg --hidden shortlog -G -r 3::
   500   $ hg --hidden shortlog -G -r 3::
   501   o  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   501   o  7:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
   502   |
   502   |