[PATCH 2 of 9 mergedriver] filemerge: turn filemerge.filemerge into a class

[Siddharth Agarwal]

On 10/7/15 11:04 AM, Augie Fackler wrote:
>> >-def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
>> >-    """perform a 3-way merge in the working directory
>> >+class mergectx(object):
>> >+    """perform a 3-way merge in the working directory"""
> it looks like this docstring lost its way and wants to live on
> mergectx.merge()? and then this type wants to be documented as a state
> container for merges or something like that
>

Yeah, I think you're right. Any chance you could you fix it in flight, 
Pierre-Yves?