equal
deleted
inserted
replaced
29 2 new content-divergent changesets |
29 2 new content-divergent changesets |
30 $ hg log -T '{node|short}\n' |
30 $ hg log -T '{node|short}\n' |
31 4b2524b7508e |
31 4b2524b7508e |
32 79fa0eb22d65 |
32 79fa0eb22d65 |
33 |
33 |
34 $ hg evolve --content-divergent --config ui.merge=internal:other |
34 $ hg evolve --content-divergent --tool :other |
35 merge:[1] div1 |
35 merge:[1] div1 |
36 with: [2] div2 |
36 with: [2] div2 |
37 base: [0] test |
37 base: [0] test |
38 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
38 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
39 working directory is now at 12772224141b |
39 working directory is now at 12772224141b |