diff tests/test-topic-push.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 f7129e3d5a38
children 85cdce113c2c 1bc4b0807c37
line wrap: on
line diff