Sublime Merge, though - I tried a couple of alternative solutions, but none of those felt like an improvement, so I still rely on it, but it has all the same drawbacks as ST, the most severe being glacial pace of changes (or total lack thereof). It's as if the dev team lacks capacity to deal with basic UX issues, year over year.

Personally, from some of the style, I'm coming down on the 'written by AI' side.