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 |
|
9 |
8 |
10 This test file tests the case of content-divergence resolution of changesets |
9 This test file tests the case of content-divergence resolution of changesets |
11 that have the null revision as the parent. |
10 that have the null revision as the parent. |
12 |
11 |
13 $ hg init issue6201 |
12 $ hg init issue6201 |