Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / external / clang / d5e1d606f8c22ebda17c6fbf952f8c1696428758 / test / Lexer / conflict-marker.c
  1. d5e1d60 Handle Perforce-style conflict markers like normal conflict markers. Perforce by Richard Smith · 13 years ago
  2. 3d48899 robustify the conflict marker stuff. Don't add 7 twice, which would by Chris Lattner · 15 years ago
  3. a572887 Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'. by Daniel Dunbar · 15 years ago
  4. 34f349d teach clang to recover gracefully from conflict markers left in source by Chris Lattner · 15 years ago