Recognition of git conflict markers from git 2.50 fails in Visual Studio Code

edit: while it's true vscode hasn't been taught to recognize recursive-merge marks, which get one longer with every recursion level, it's also true that some rename markers now start out one longer than before, and it's not clear this was intentional, certainly there's nothing recursive about the merge in the question's example history.

I'm pretty sure what you're seeing is vscode not understanding recursive merges.

A quick git log --grep extramarkersize turns up b2a7942b, making the default marker grow longer with recursion depth in 2.21, more than five years ago, so the behavior isn't new to Git, and merge ort has been the default since 2.34, four years ago. I'm not sure what you're thinking changed in 2.50.

So I think what's changed is most likely you've begun relying on recursive merges (ort will recurse too) and vscode doesn't understand them.