I wonder why they introduced new diff mode, rather than making diff3 better.
I guess the difference is subtle, especially that there can be other merges within the same file that merge cleanly in both cases.
I hate this approach because this is very lazy (you avoid thinking about hard stuff and pick easy solution) and is very short term
sure you can introduce 150 configuration modes
but it makes your thing messy, confusing for new people, confusing for inexperienced and requires more maintenance
it's like taking tech debt
Loads of people who have to maintain things.
>by the time it actually gets removed in a future version.
doesn't always happen, so we're left with new, new v2, new v3 options and old one still exists "because it may break somebody's workflow"