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();
|
2017-09-14 17:23:50 +02:00
|
|
|
verify.currentFileContentIs(`class C {
|
|
|
|
<<<<<<< HEAD
|
|
|
|
v = 1;
|
|
|
|
||||||| merged common ancestors
|
|
|
|
v = 3;
|
|
|
|
=======
|
|
|
|
v = 2;
|
|
|
|
>>>>>>> Branch - a
|
|
|
|
}`);
|