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

29 lines
368 B
TypeScript

//// [tests/cases/compiler/conflictMarkerDiff3Trivia2.ts] ////
//// [conflictMarkerDiff3Trivia2.ts]
class C {
foo() {
<<<<<<< B
a();
}
||||||| merged common ancestors
c();
}
=======
b();
}
>>>>>>> A
public bar() { }
}
//// [conflictMarkerDiff3Trivia2.js]
"use strict";
class C {
foo() {
a();
}
bar() { }
}