equal
deleted
inserted
replaced
512 $ hg --hidden shortlog -r 'successors(2fe6)' |
512 $ hg --hidden shortlog -r 'successors(2fe6)' |
513 6:a360947f6faf draft fix bug 24 (v2 by bob) |
513 6:a360947f6faf draft fix bug 24 (v2 by bob) |
514 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
514 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
515 |
515 |
516 Use evolve to fix the divergence. |
516 Use evolve to fix the divergence. |
517 $ HGMERGE=internal:other hg evolve --divergent |
517 $ HGMERGE=internal:other hg evolve --contentdivergent |
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 |