TypeScript/tests/cases/fourslash/formatConflictDiff3Marker1.ts

23 lines
363 B
TypeScript
Raw Normal View History

2017-05-29 13:41:28 +02:00
/// <reference path='fourslash.ts' />
////class C {
////<<<<<<< HEAD
////v = 1;
////||||||| merged common ancestors
////v = 3;
////=======
////v = 2;
////>>>>>>> Branch - a
////}
format.document();
verify.currentFileContentIs(`class C {
<<<<<<< HEAD
v = 1;
||||||| merged common ancestors
v = 3;
=======
v = 2;
>>>>>>> Branch - a
}`);