mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
17 lines
353 B
Plaintext
17 lines
353 B
Plaintext
//// [tests/cases/compiler/conflictMarkerDiff3Trivia1.ts] ////
|
|
|
|
=== conflictMarkerDiff3Trivia1.ts ===
|
|
class C {
|
|
>C : Symbol(C, Decl(conflictMarkerDiff3Trivia1.ts, 0, 0))
|
|
|
|
<<<<<<< HEAD
|
|
v = 1;
|
|
>v : Symbol(C.v, Decl(conflictMarkerDiff3Trivia1.ts, 0, 9))
|
|
|
|
||||||| merged common ancestors
|
|
v = 3;
|
|
=======
|
|
v = 2;
|
|
>>>>>>> Branch-a
|
|
}
|