mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
34 lines
1018 B
Plaintext
34 lines
1018 B
Plaintext
conflictMarkerDiff3Trivia2.ts(3,1): error TS1185: Merge conflict marker encountered.
|
|
conflictMarkerDiff3Trivia2.ts(4,6): error TS2304: Cannot find name 'a'.
|
|
conflictMarkerDiff3Trivia2.ts(6,1): error TS1185: Merge conflict marker encountered.
|
|
conflictMarkerDiff3Trivia2.ts(9,1): error TS1185: Merge conflict marker encountered.
|
|
conflictMarkerDiff3Trivia2.ts(12,1): error TS1185: Merge conflict marker encountered.
|
|
|
|
|
|
==== conflictMarkerDiff3Trivia2.ts (5 errors) ====
|
|
class C {
|
|
foo() {
|
|
<<<<<<< B
|
|
~~~~~~~
|
|
!!! error TS1185: Merge conflict marker encountered.
|
|
a();
|
|
~
|
|
!!! error TS2304: Cannot find name 'a'.
|
|
}
|
|
||||||| merged common ancestors
|
|
~~~~~~~
|
|
!!! error TS1185: Merge conflict marker encountered.
|
|
c();
|
|
}
|
|
=======
|
|
~~~~~~~
|
|
!!! error TS1185: Merge conflict marker encountered.
|
|
b();
|
|
}
|
|
>>>>>>> A
|
|
~~~~~~~
|
|
!!! error TS1185: Merge conflict marker encountered.
|
|
|
|
public bar() { }
|
|
}
|
|
|