This is actually Meld itself ported to Mac. Doesn't require X and keybinding changed to be adapt Mac shortcuts.
meld is a visual diff and merge tool targeted at developers. meld helps you compare files, directories, and version controlled projects. it provides two and threeway comparison of both files and directories, and has support for many popular version control systems.
on os x, meld is not yet officially supported. the best option are these prebuilt binaries. you can also get meld from macports, fink or brew; none of these methods are supported.
Productivity Developer Tools File Management
python diff merge-folders
WinMerge 2011 series is a fork of the original WinMerge application that compiles without ATL/MFC dependencies.
winmerge jp is a fork of original winmerge that incorporates many own features including 3-way compare, high dpi support and many more.
