Kaleidoscope is a new file comparison utility. As you’d expect from Sofa, the interface is pretty. It seems oriented towards designers, with some nifty ways of comparing images. It also has some good ways of comparing text files, but it doesn’t support editing or even applying changes. There’s an interesting tabbed interface so that you can see multiple pairs of files at once—rather than in sequence, as with some other tools. It doesn’t do folder comparisons like BBEdit or Changes. Overall, I think it’s prettier but less useful than Changes, with the same basic drawback: it isn’t quite integrated enough to fit into my workflow. I want more than the ability to set it as an external git diff tool.
Lately, I’ve been using GitX for viewing and accepting/rejecting diffs and BBEdit for deeper comparisons and editing. GitX is great for comparing against the HEAD and staging, but it doesn’t make it easy enough to get at previous versions of a given file or tree. And with BBEdit you’re totally on your own. Hopefully, one of these days BBEdit will get first-class Git support or I’ll have time to make some code contributions to GitX.