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

[Matt Mackall]

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.

-- 
Mathematics is the supreme nostalgia of our time.