[cfe-commits] [PATCH] Handle Perforce-style conflict markers
richard at metafoo.co.uk
Tue Oct 11 17:40:53 PDT 2011
On Wed, October 12, 2011 00:15, Chris Lattner wrote:
> On Oct 6, 2011, at 7:54 PM, Richard Smith wrote:
>> Perforce uses a different form of conflict markers from other tools:
>>>>>> ORIGINAL foo#1
>> a ==== THEIR foo#2
>> b==== YOUR foo
>> The attached patch adds support for this style of conflict marker. Please
> Seems ok to me, but please rename IsInConflictMarker to
> CurrentConflictMarkerState or something like that.
Thanks, done, in r141751.
More information about the cfe-commits