[hprotagonist]

I've been using kdiff3 for like 15 years by now: https://sourceforge.net/projects/kdiff3/

and still feel most at home there.