Mercurial > evolve
comparison tests/test-evolve-content-divergent-first-changeset.t @ 5144:7fa4bb23a78a stable
branching: merge into stable in preparation for release
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 28 Feb 2020 20:18:42 +0700 |
| parents | 1fe3f7ffb462 |
| children | 1752a2e7a226 e78926a1a473 |
comparison
equal
deleted
inserted
replaced
| 5142:7bcda49915e8 | 5144:7fa4bb23a78a |
|---|---|
| 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 |