summaryrefslogtreecommitdiff
path: root/test/Lexer/conflict-marker.c
AgeCommit message (Expand)Author
2014-12-14Lex: Don't crash if both conflict markers are on the same lineDavid Majnemer
2012-07-11Allow -verify directives to be filtered by preprocessing.Jordan Rose
2011-10-12Handle Perforce-style conflict markers like normal conflict markers. PerforceRichard Smith
2010-05-17robustify the conflict marker stuff. Don't add 7 twice, which wouldChris Lattner
2009-12-15Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.Daniel Dunbar
2009-12-14teach clang to recover gracefully from conflict markers left in sourceChris Lattner