[PATCH 7 of 7 mergedriver] mergestate: allow storing and retrieving change/delete conflicts

[Siddharth Agarwal]

On 11/16/15 16:14, Siddharth Agarwal wrote:
> Yes, hg update -C to abort the merge and update cleanly elsewhere will 
> still (hopefully!) work. Let me double check that, though! 

I just double checked. It doesn't actually work. Well crap. We may need 
a v3 mergestate that is identical to the v2 mergestate but actually 
fixes this. :/

- Siddharth