equal
deleted
inserted
replaced
505 $ hg --hidden shortlog -r 'successors(2fe6)' |
505 $ hg --hidden shortlog -r 'successors(2fe6)' |
506 6:a360947f6faf draft fix bug 24 (v2 by bob) |
506 6:a360947f6faf draft fix bug 24 (v2 by bob) |
507 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
507 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
508 |
508 |
509 Use evolve to fix the divergence. |
509 Use evolve to fix the divergence. |
510 $ HGMERGE=internal:other hg evolve --divergent |
510 $ HGMERGE=internal:other hg evolve --contentdivergent |
511 merge:[6] fix bug 24 (v2 by bob) |
511 merge:[6] fix bug 24 (v2 by bob) |
512 with: [7] fix bug 24 (v2 by alice) |
512 with: [7] fix bug 24 (v2 by alice) |
513 base: [4] fix bug 24 (v1) |
513 base: [4] fix bug 24 (v1) |
514 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
514 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
515 working directory is now at 5ad6037c046c |
515 working directory is now at 5ad6037c046c |