518 $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent |
518 $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent |
519 merge:[5] fix bug 24 (v2 by bob) |
519 merge:[5] fix bug 24 (v2 by bob) |
520 with: [6] fix bug 24 (v2 by alice) |
520 with: [6] fix bug 24 (v2 by alice) |
521 base: [4] fix bug 24 (v1) |
521 base: [4] fix bug 24 (v1) |
522 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
522 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
523 working directory is now at aa824ceedb8b |
523 working directory is now at 0978c15d2db6 |
524 $ hg log -q -r 'contentdivergent()' |
524 $ hg log -q -r 'contentdivergent()' |
525 |
525 |
526 Figure SG10: Bob's repository after fixing divergence. |
526 Figure SG10: Bob's repository after fixing divergence. |
527 $ hg --hidden shortlog -G -r 3:: |
527 $ hg --hidden shortlog -G -r 3:: |
528 @ 7:aa82 draft fix bug 24 (v2 by bob) |
528 @ 7:0978 draft fix bug 24 (v2 by bob) |
529 | |
529 | |
530 | x 6:e3a5 draft fix bug 24 (v2 by alice) |
530 | x 6:e3a5 draft fix bug 24 (v2 by alice) |
531 |/ |
531 |/ |
532 | x 5:541f draft fix bug 24 (v2 by bob) |
532 | x 5:541f draft fix bug 24 (v2 by bob) |
533 |/ |
533 |/ |