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