equal
deleted
inserted
replaced
39 $ hg evolve --content-divergent --tool :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 3b448ec6f793 |
44 working directory is now at 62fcb3488421 |
45 |
45 |
46 $ hg evolve --list |
46 $ hg evolve --list |