DiffFork

Pretty dang sweet diff tool. It has the looks of a native os x app, not some junk ported over as a second thought. It has the advantage over Kaleidoscope of being more reasonably priced and it has the ability to edit on the fly. Uncomplicated, but powerful. I haven't used it on any huge files. I may come back and change my assessment after putting it through its paces a bit more, but so far it looks better than anything I've seen.

Best diff and merge tool I've used on OS X. FileMerge is long in the tooth, and pretty much everything else is abandonware or overpriced Java crap. Kaleidoscope is cute and all, but not nearly as functional (can't do merges or folder comparisons). The developer of DiffFork provides fantastic customer service as well. Give it a download, and you can try it for 15 individual days (not 15 calendar days). Negatives: I sometimes wish there was a third text pane for doing complex merges, more along the lines of FileMerge.

I've been using DiffFork for about a week now. It is easy to use, has a simple, nicely done interface, and does exactly what a Diff utility should.

DIfffork is not only a very capable application, but it's very intuitive and quite elegant. A true OS X look and feel is very important to me, and it has that IMHO. The price is much lower than a few of it's main competitors so i think it's well worth the money. Apple filemerge is free, but it's an UI disaster. If you're fine with that, then by all means, continue using it. I tried using it, but it didn't take me long to look in another direction. To each, his own.

I think its a bit overpriced. I've used Apple's FileMerge so far which is free and pretty good. Lack of support for PPC users.

DiffFork runs on 10.5 and later, **Intel Only**.