summaryrefslogtreecommitdiffstats
path: root/test/Lexer/conflict-marker.c
Commit message (Expand)AuthorAgeFilesLines
* Handle Perforce-style conflict markers like normal conflict markers. PerforceRichard Smith2011-10-121-2/+10
* robustify the conflict marker stuff. Don't add 7 twice, which wouldChris Lattner2010-05-171-2/+3
* Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.Daniel Dunbar2009-12-151-1/+1
* teach clang to recover gracefully from conflict markers left in sourceChris Lattner2009-12-141-0/+29