[cfe-commits] [PATCH] Handle Perforce-style conflict markers

[Chris Lattner]

On Oct 6, 2011, at 7:54 PM, Richard Smith wrote:

> Hi,
> 
> Perforce uses a different form of conflict markers from other tools:
> 
>>>>> ORIGINAL foo#1
> a
> ==== THEIR foo#2
> b
> ==== YOUR foo
> c
> <<<<
> 
> The attached patch adds support for this style of conflict marker. Please review!

Seems ok to me, but please rename IsInConflictMarker to CurrentConflictMarkerState or something like that.

-Chris