Files
tsgo/testdata/baselines/reference/submodule/compiler/conflictMarkerDiff3Trivia1.js

21 lines
338 B
TypeScript

//// [tests/cases/compiler/conflictMarkerDiff3Trivia1.ts] ////
//// [conflictMarkerDiff3Trivia1.ts]
class C {
<<<<<<< HEAD
v = 1;
||||||| merged common ancestors
v = 3;
=======
v = 2;
>>>>>>> Branch-a
}
//// [conflictMarkerDiff3Trivia1.js]
"use strict";
class C {
constructor() {
this.v = 1;
}
}