evolve: store the evolvestate file when encountering conflicts This patch makes `hg evolve` store the evolvestate file when it encounters merge conflicts while resolving content-divergence.

{"site_id":"cf023865-0eb1-49e9-951b-29555949abf0","path":"html/"}