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 | a9e33d44a6c865699f0ce5808999b915f211b6fe (patch) | |
| tree | 9267f35825232a132317037b37e4cde764bbb6db /lldb/source/API/SBData.cpp | |
| parent | c585de670f382d1a504a5da9351cbc78314ee539 (diff) | |
| download | bcm5719-llvm-a9e33d44a6c865699f0ce5808999b915f211b6fe.tar.gz bcm5719-llvm-a9e33d44a6c865699f0ce5808999b915f211b6fe.zip | |
Handle Perforce-style conflict markers like normal conflict markers. Perforce
swaps over the <<<< and >>>> markers, and uses shorter markers than traditional
tools.
llvm-svn: 141751
Diffstat (limited to 'lldb/source/API/SBData.cpp')
0 files changed, 0 insertions, 0 deletions
