[PATCH 1 of 3 v2] filemerge: extract conflict marker searching into its own function

[Pierre-Yves David]

On 09/01/2014 11:16 PM, Matt Mackall wrote:
> On Sun, 2014-08-31 at 09:56 +0200, Gregory Szorc wrote:
>
>> +        if haveconflictmarkers(fcd):
>>
>> +def hasconflictmarkers(fctx):
>
> I question whether this was tested, but I like the idea.

He might have piped his patch through an mq filter to tests your skills.

-- 
Pierre-Yves David