equal
deleted
inserted
replaced
518 merge:[6] fix bug 24 (v2 by bob) |
518 merge:[6] fix bug 24 (v2 by bob) |
519 with: [7] fix bug 24 (v2 by alice) |
519 with: [7] fix bug 24 (v2 by alice) |
520 base: [4] fix bug 24 (v1) |
520 base: [4] fix bug 24 (v1) |
521 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
521 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
522 working directory is now at 5ad6037c046c |
522 working directory is now at 5ad6037c046c |
523 $ hg log -q -r 'divergent()' |
523 $ hg log -q -r 'contentdivergent()' |
524 |
524 |
525 Figure SG10: Bob's repository after fixing divergence. |
525 Figure SG10: Bob's repository after fixing divergence. |
526 $ hg --hidden shortlog -G -r 3:: |
526 $ hg --hidden shortlog -G -r 3:: |
527 @ 9:5ad6037c046c draft fix bug 24 (v2 by bob) |
527 @ 9:5ad6037c046c draft fix bug 24 (v2 by bob) |
528 | |
528 | |