mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
25 lines
459 B
Plaintext
25 lines
459 B
Plaintext
//// [tests/cases/compiler/conflictMarkerDiff3Trivia2.ts] ////
|
|
|
|
=== conflictMarkerDiff3Trivia2.ts ===
|
|
class C {
|
|
>C : Symbol(C, Decl(conflictMarkerDiff3Trivia2.ts, 0, 0))
|
|
|
|
foo() {
|
|
>foo : Symbol(C.foo, Decl(conflictMarkerDiff3Trivia2.ts, 0, 9))
|
|
|
|
<<<<<<< B
|
|
a();
|
|
}
|
|
||||||| merged common ancestors
|
|
c();
|
|
}
|
|
=======
|
|
b();
|
|
}
|
|
>>>>>>> A
|
|
|
|
public bar() { }
|
|
>bar : Symbol(C.bar, Decl(conflictMarkerDiff3Trivia2.ts, 4, 3))
|
|
}
|
|
|