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

[Richard Smith]

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!

Thanks,
Richard
-------------- next part --------------
A non-text attachment was scrubbed...
Name: perforce-conflict-markers.diff
Type: text/x-patch
Size: 8501 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20111007/d35e976f/attachment.bin>