TypeScript/tests/cases/compiler/conflictMarkerDiff3Trivia2.ts

16 lines
159 B
TypeScript
Raw Normal View History

2017-05-29 13:41:28 +02:00
class C {
foo() {
<<<<<<< B
a();
}
||||||| merged common ancestors
c();
}
=======
b();
}
>>>>>>> A
public bar() { }
}