[hprotagonist]

after all these years i still mostly use kdiff3

[politician]

It remains the best option for 3-way merge. For diff, I find myself just reading the raw diff output.

[vlovich123]

Works fine for 2-way diffs too