comparison .hgignore @ 3734:aae54e80c95c

evolve: store divergent nodes in evolvestate when resolving content-divergence We need to store the divergent nodes in evolvestate so that we can continue an interrupted phase divergence resolution.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 17:54:01 +0530
parents aad37ffd7d58
children ba316ce15040
comparison
equal deleted inserted replaced
3733:7aa22aadb7bb 3734:aae54e80c95c