Skip to content
Commit a9e33d44 authored by Richard Smith's avatar Richard Smith
Browse files

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
parent c585de67
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment