Differences between what? The Apple Developer tools (free from ADC) ship with a pretty funky visual front-end to diff. As diff is a command line Unix tool it's for text files only...
Differences between what? The Apple Developer tools (free from ADC) ship with a pretty funky visual front-end to diff. As diff is a command line Unix tool it's for text files only...
Araxis Merge (a well-known comparison/merge application for Windows) is currently being re-written for OS X as a native Cocoa application. It's early days yet, but an early-access test release is available:
Araxis Merge (a well-known comparison/merge application for Windows) is currently being re-written for OS X as a native Cocoa application. It's early days yet, but an early-access test release is available:
I use Diffmerge as it's 1) free and 2) Cross Platform (Mac, Linux, Windows) and will do a 3 way compare/merge as well as allow you to diff entire directory trees if needed. It's also compatible with Sourcegear's Code repositories.
Note: mac version seems to be more stable and much faster than on Windows... go figure ;-)