News for hackers. Stuff that matters.
Re:Meld - a great visual diff and merge tool for linux by turtle4 on Monday December 27, 2010 @09:49PM (#2044430)
Diffmerge from sourcegear is free and runs natively on os x (in addition to win and Linux) and does 3 panel merges, as well as folder diffs pretty well.

There are no comments on this comment yet.