TypeScript/tests/cases/compiler/conflictMarkerDiff3Trivia2.ts
2017-05-30 08:04:18 +02:00

16 lines
159 B
TypeScript

class C {
foo() {
<<<<<<< B
a();
}
||||||| merged common ancestors
c();
}
=======
b();
}
>>>>>>> A
public bar() { }
}