Better Git Conflicts with zdiff3
diff3 is great for resolving conflicts in git. I love it and I've used it ever since I laid eyes on the linked article years ago. However, diff3 has a frustrating user experience flaw in it that the merge conflict version does not have. Let's take a look at this