d96dfeb708
* Don't normalize whitespace in fourslash tests * Only render whitespace when the diff is text-only
19 lines
273 B
TypeScript
19 lines
273 B
TypeScript
/// <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
|
|
}`);
|