equal
deleted
inserted
replaced
3 > [extensions] |
3 > [extensions] |
4 > evolve= |
4 > evolve= |
5 > [experimental] |
5 > [experimental] |
6 > evolution.allowdivergence = True |
6 > evolution.allowdivergence = True |
7 > EOF |
7 > EOF |
|
8 |
8 |
9 |
9 This test file tests the case of content-divergence resolution of changesets |
10 This test file tests the case of content-divergence resolution of changesets |
10 that have the null revision as the parent. |
11 that have the null revision as the parent. |
11 |
12 |
12 $ hg init issue6201 |
13 $ hg init issue6201 |
38 $ hg evolve --content-divergent --tool :other |
39 $ hg evolve --content-divergent --tool :other |
39 merge:[1] div1 |
40 merge:[1] div1 |
40 with: [2] div2 |
41 with: [2] div2 |
41 base: [0] test |
42 base: [0] test |
42 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 |
43 working directory is now at 12772224141b |
44 working directory is now at 62fcb3488421 |
44 |
45 |
45 $ hg evolve --list |
46 $ hg evolve --list |