mirror of
https://github.com/hanzoai/tsgo.git
synced 2026-10-30 19:37:15 +00:00
29 lines
368 B
TypeScript
29 lines
368 B
TypeScript
//// [tests/cases/compiler/conflictMarkerDiff3Trivia2.ts] ////
|
|
|
|
//// [conflictMarkerDiff3Trivia2.ts]
|
|
class C {
|
|
foo() {
|
|
<<<<<<< B
|
|
a();
|
|
}
|
|
||||||| merged common ancestors
|
|
c();
|
|
}
|
|
=======
|
|
b();
|
|
}
|
|
>>>>>>> A
|
|
|
|
public bar() { }
|
|
}
|
|
|
|
|
|
//// [conflictMarkerDiff3Trivia2.js]
|
|
"use strict";
|
|
class C {
|
|
foo() {
|
|
a();
|
|
}
|
|
bar() { }
|
|
}
|