Mercurial > evolve
comparison tests/test-evolve-orphan-merge.t @ 3628:170b99a9c0b4
evolve: write data to evolvestate in case on conflicts in phase-divergence
This patch makes phase-divergence resolution write data to evolvestate instead
of graftstate. The `evolve --continue` handling of phase-divergence is broken
which will be done in upcoming patches.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 23 Mar 2018 19:36:08 +0530 |
| parents | d53277cdc1e7 |
| children | d5adce52cef4 f6979d64b9fb |
comparison
equal
deleted
inserted
replaced
| 3627:31569df48c82 | 3628:170b99a9c0b4 |
|---|