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

[Mads Kiilerich]

On 08/31/2014 09:56 AM, Gregory Szorc wrote:
> +        if haveconflictmarkers(fcd):
...
> +def hasconflictmarkers(fctx):

This inconsistency is primarily a bug in the definition of the English 
language, but it also highlights the need for test coverage of this.

/Mads