| commit | 34f349da38a7bd99103e12d8ea6c73bc8d025193 | [log] [tgz] |
|---|---|---|
| author | Chris Lattner <sabre@nondot.org> | Mon Dec 14 06:16:57 2009 +0000 |
| committer | Chris Lattner <sabre@nondot.org> | Mon Dec 14 06:16:57 2009 +0000 |
| tree | 0425b8febb380dbc2b5b4b34bf0e25c4b28692ac | |
| parent | c3420ffb282c6ffc0192013bf8045b6c21eddece [diff] |
teach clang to recover gracefully from conflict markers left in source files: PR5238. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91270 91177308-0d34-0410-b5e6-96231b3b80d8