I made the change a few years ago, and never looked back. It can take a little adjusting to at first, because it's not super clear exactly what you're looking

I made the change a few years ago, and never looked back. It can take a little adjusting to at first, because it's not super clear exactly what you're looking at, but it's definitely worth it. For the "simple" cases you're no worse off, but for the gnarly conflicts it's such a huge help to have the full context there. ---- Truth be told, I use zdiff3, the "zealous" diff3, where git >= 2.35[1] is available. Some good examples/thoughts at https://stackoverflow.com/a/71254097/2521092 https://stackoverflow.com/a/71254097/2521092 and https://stackoverflow.com/a/70387424/2521092 https://stackoverflow.com/a/70387424/2521092 1: https://github.blog/2022-01-24-highlights-from-git-2-35/ https://github.blog/2022-01-24-highlights-from-git-2-35/