[cfe-commits] [PATCH] Handle Perforce-style conflict markers
clattner at apple.com
Tue Oct 11 16:15:15 PDT 2011
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
> ==== THEIR foo#2
> ==== YOUR foo
> 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.
More information about the cfe-commits