did anyone else notice that since intellij 2017 3 when resol kotlinlang #random

did anyone else notice that since intellij 2017.3 ...

poohbar

12/01/2017, 2:32 PM

did anyone else notice that since intellij 2017.3 when resolving merge conflict it shows the

<<<<< HEAD

and

>>>>> master

strings? is this documented?