TypeScript/tests/cases/fourslash/formatConflictMarker1.ts

/// <reference path='fourslash.ts' />

////class C {
////<<<<<<< HEAD
////v = 1;
////=======
////v = 2;
////>>>>>>> Branch - a
////}

format.document();
verify.currentFileContentIs(`class C {
<<<<<<< HEAD
    v = 1;
=======
v = 2;
>>>>>>> Branch - a
}`);
Make the compiler resilient to encountering merge conflict markers in a source code file. 2014-12-12 01:56:10 +01:00			`/// <reference path='fourslash.ts' />`

			`////class C {`
			`////<<<<<<< HEAD`
Update conflict marker formatting test. We now no longer format the second branch of hte merge. 2014-12-19 20:33:45 +01:00			`////v = 1;`
Make the compiler resilient to encountering merge conflict markers in a source code file. 2014-12-12 01:56:10 +01:00			`////=======`
			`////v = 2;`
			`////>>>>>>> Branch - a`
			`////}`

			`format.document();`
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 17:23:50 +02:00			verify.currentFileContentIs(`class C {
			`<<<<<<< HEAD`
			`v = 1;`
			`=======`
			`v = 2;`
			`>>>>>>> Branch - a`
			}`);