diff3 is a Unix utility to compare three files and show any differences among them.
Recently I enabled diff3 and it's much easier to resolve conflict now. Previously in some cases I had to check …
git git-diff diff3Is it possible to set Git up so that I can use the three-way compare in KDiff3? I have two …
git kdiff3 diff3