equal
deleted
inserted
replaced
1 $ . $TESTDIR/testlib/pythonpath.sh |
1 $ . $TESTDIR/testlib/pythonpath.sh |
2 $ echo "[extensions]" >> $HGRCPATH |
2 $ cat >> $HGRCPATH << EOF |
3 $ echo "evolve=" >> $HGRCPATH |
3 > [extensions] |
|
4 > evolve= |
|
5 > [experimental] |
|
6 > evolution.allowdivergence = True |
|
7 > EOF |
|
8 |
4 |
9 |
5 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 |
6 that have the null revision as the parent. |
11 that have the null revision as the parent. |
7 |
12 |
8 $ hg init issue6201 |
13 $ hg init issue6201 |