[turtle4]

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.