equal
deleted
inserted
replaced
483 adding changesets |
483 adding changesets |
484 adding manifests |
484 adding manifests |
485 adding file changes |
485 adding file changes |
486 added 1 changesets with 1 changes to 1 files (+1 heads) |
486 added 1 changesets with 1 changes to 1 files (+1 heads) |
487 1 new obsolescence markers |
487 1 new obsolescence markers |
488 2 new content-divergent changesets |
|
489 new changesets e3f99ce9d9cd |
488 new changesets e3f99ce9d9cd |
490 (run 'hg heads' to see heads, 'hg merge' to merge) |
489 (run 'hg heads' to see heads, 'hg merge' to merge) |
491 |
490 |
492 Figure SG09: multiple heads! divergence! oh my! |
491 Figure SG09: multiple heads! divergence! oh my! |
493 $ hg --hidden shortlog -G -r 3:: |
492 $ hg --hidden shortlog -G -r 3:: |
494 * 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
493 o 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
495 | |
494 | |
496 | @ 5:a360947f6faf draft fix bug 24 (v2 by bob) |
495 | @ 5:a360947f6faf draft fix bug 24 (v2 by bob) |
497 |/ |
496 |/ |
498 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
497 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
499 |/ |
498 |/ |