Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle Perforce-style conflict markers like normal conflict markers. Perforce | Richard Smith | 2011-10-12 | 1 | -2/+10 |
* | robustify the conflict marker stuff. Don't add 7 twice, which would | Chris Lattner | 2010-05-17 | 1 | -2/+3 |
* | Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'. | Daniel Dunbar | 2009-12-15 | 1 | -1/+1 |
* | teach clang to recover gracefully from conflict markers left in source | Chris Lattner | 2009-12-14 | 1 | -0/+29 |