mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
21 lines
338 B
TypeScript
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;
|
|
}
|
|
}
|