3 commits

Author	SHA1	Message	Date
Andy	d96dfeb708	Don't normalize whitespace in fourslash tests (#18447) ... * Don't normalize whitespace in fourslash tests * Only render whitespace when the diff is text-only	2017-09-14 08:23:50 -07:00
Cyrus Najmabadi	0707350c7b	Update conflict marker formatting test. We now no longer format the second branch of hte merge.	2014-12-19 11:33:45 -08:00
Cyrus Najmabadi	7df3a407c2	Make the compiler resilient to encountering merge conflict markers in a source code file.	2014-12-11 16:56:10 -08:00