3 ms·

Is it possible to get a "diff3"-like conflict style? That is showing <<< side1 ||| ancestor === side2 >>>