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 n

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/ http://meldmerge.org/