[PATCH 3 of 6 mergedriver] mergestate: add a constructor that sets up a fresh merge state

Siddharth Agarwal sid at less-broken.com
Tue Nov 17 18:58:48 CST 2015


On 11/17/15 16:57, Martin von Zweigbergk wrote:
> I think I would prefer mergestate.clean(). I would not be surprised 
> that it returns the clean state. But then again, perhaps 'fresh' would 
> also be fine if looking at it without preconception. You pick. If you 
> choose to keep 'fresh', I can just queue the series.

I like clean(). If you queue up the first two I'll send a V2 of the next 
four.


More information about the Mercurial-devel mailing list