Originally a product for Microsoft Windows, the Beyond Compare team has contributed a fine diff tool to the Mac platform. It might not be the most elegant tool, but it's definitely a solid one that does the job of comparing & merging text. Being part of its developer toolset, Apple's own merge tool comes at no additional costs.
