diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-12 00:37:51 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-12 00:37:51 +0000 |
| commit | d5e1d606f8c22ebda17c6fbf952f8c1696428758 (patch) | |
| tree | 15b82c6ae27ba0ee786fbc31796d37f0dc3830bf /lib/CodeGen/CGDebugInfo.cpp | |
| parent | 13546a871db44c707001f507a9edfd0d5bcc81b4 (diff) | |
Handle Perforce-style conflict markers like normal conflict markers. Perforce
swaps over the <<<< and >>>> markers, and uses shorter markers than traditional
tools.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141751 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDebugInfo.cpp')
0 files changed, 0 insertions, 0 deletions