4 Commits

Author	SHA1	Message	Date
Richard Smith	a9e33d44a6	Handle Perforce-style conflict markers like normal conflict markers. Perforce ... swaps over the <<<< and >>>> markers, and uses shorter markers than traditional tools. llvm-svn: 141751	2011-10-12 00:37:51 +00:00
Chris Lattner	467f6bcfe5	robustify the conflict marker stuff. Don't add 7 twice, which would ... make it miss (invalid) things like: <<<<<<< >>>>>>> and crash if <<<<<<< was at the end of the line. When we find a >>>>>>> that is not at the end of the line, make sure to reset Pos so we don't crash on something like: <<<<<<< >>>>>>> This isn't worth making testcases for, since each would require a new file. rdar://7987078 - signal 11 compiling "<<<<<<<<<<" llvm-svn: 103968	2010-05-17 20:27:25 +00:00
Daniel Dunbar	8fbe78f6fc	Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'. ... - This is designed to make it obvious that %clang_cc1 is a "test variable" which is substituted. It is '%clang_cc1' instead of '%clang -cc1' because it can be useful to redefine what gets run as 'clang -cc1' (for example, to set a default target). llvm-svn: 91446	2009-12-15 20:14:24 +00:00
Chris Lattner	7c027ee4c2	teach clang to recover gracefully from conflict markers left in source ... files: PR5238. llvm-svn: 91270	2009-12-14 06:16:57 +00:00