a4f9bf0fce
* Create type aliases for unresolved type symbols * Accept new baselines * Update fourslash tests * Unresolved import aliases create tagged unresolved symbols * Add comments * Accept new baselines * Add fourslash tests
9 lines
123 B
Plaintext
9 lines
123 B
Plaintext
=== tests/cases/compiler/conflictMarkerTrivia4.ts ===
|
|
const x = <div>
|
|
>x : div
|
|
><div> : div
|
|
|
|
<<<<<<< HEAD
|
|
> : any
|
|
|