News for hackers. Stuff that matters.
Re:Diff tools on Mac OS X - an overview by quarterto on Thursday December 05, 2013 @11:32AM (#6855236)
I've been using Meld [1] via XQuartz. It's not pretty (and getting it working is an absolute pain) but goddamn does it get the job done. Nothing I've tried is nearly as functional. And it's open source!

[1] http://meldmerge.org/

There are no comments on this comment yet.