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

[Martin von Zweigbergk]

On Tue, Nov 17, 2015 at 4:58 PM Siddharth Agarwal <sid at less-broken.com>
wrote:

> 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.
>

Deal!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20151118/edd88c6b/attachment-0002.html>