WinMerge for Macs

Try SourceGear's DiffMerge: http://www.sourcegear.com/diffmerge/

I have been looking for a merge tool as easy to use as WinMerge, but for the Mac. I mean, the development tools provided with XCode, along with their merge tool, look beautiful, but sometimes you just want something that's simple and workable.

DiffMerge does the trick. It shows you the differences in folders and files, and lets you merge as needed. Only downside is you can only merge from left-to-right, and not vice-versa. But it is a minor caveat, given the ease of use and low overhead. A perfect addition to your dev arsenal.

DiffMerge was made for SourceGear, so you may want to check them out, too.