Formatter vs. merge conflicts

[Simn]

<<<<<<<<<<<< development

============= incoming

>>>>>>>>>>>>>

This is turned into << << << << << << development == == == == == == = incoming >>> >>> >>> >>> >.

[Simn]

That was quick, thanks!

[AlexHaxe]

Your welcome, it would have been quicker, if newest lix didn't break my builds.

The fix simply looks for lines starting with at least 7 <.
It's not perfect, since that could be a valid part of a multiline string literal (or a comment), but since merge conflicts can happen inside strings or comments, they are not guaranteed to show up as weird combination of tokens after parsing. So using tokentree would not be much better.

I hope it doesn't impact performance too much.