Spot the differences,
merge in seconds

Spot the differences in text and image files, or even folders full of files. Review changes in seconds, with the world's most powerful file comparison and merge app.

Download Free Trial

A diff and merge tool that deeply integrates with Git.

The File History lets you browse and compare all revisions of a file.

Details about each commit help you understand context and take action.

3-Way Merge

Clearly see Git commits leading to a conflict.

Have commit messages right at your fingertips.

Show changes between Base and each side for deeper insight.

Code Review in one clear Changeset

All changes between 2 commits, in one place.

Filter by modification, file type, and file name.

Dive deep with inline diffs, jump to File History, and more.

Text Compare

Character-level diffs that catch even subtle edits.

Highlight what matters — have unchanged areas collapsed.

Quickly navigate between changes.

Image Compare

Pixel-perfect diffing for designers and developers.

Split, blink, drag, or diff to spot visual changes instantly.

File Inspector shows formats, color profiles, and much more.

Compare directories

Compare entire folder trees at a glance.

Dive deep with inline diffs, Quick Look, and more.

Quickly Copy items from one folder to the other side.

Loved by the community

Don't take our word for it — listen to what community members have to say.

Each time there's a new major release of Kaleidoscope I wonder what new features the developers can add to a diff app. Throughout the v4.x releases, they introduced several features to enable closer integration with git, and v5 takes that one step further by allowing you to open source repositories with some super handy views for branch comparison and easy ways to see what changes were made in the last timer period or number of commits. It's not a cheap app, but it is absolutely the best at its job.
Dave Verwer
iOS Dev Weekly - Issue 669
The new Git features are great. I'm finding myself using Kaleidoscope alongside Tower for certain tasks. Kaleidoscope doesn't even attempt to do most of what Tower does, but there are times when it's quicker or better to open up a comparison or file history in Kaleidoscope.

I really like how the main Kaleidoscope window keeps a history of recent comparisons, both globally and per-repository.
Michael Tsai
mjtsai.com
Kaleidoscope keeps it simple, and has a beautiful user interface that makes resolving conflicts a breeze. It allows you to view what changed over a time period, compare branches, and comb through the entire history of your files.

I have not even begun to scratch the surface of all the features Kaleidoscope has, but I still think it is worth it just for the basic diff and merge functionality. Give it a try, you will not be disappointed!
Robbie Wagner
robbiethewagner.dev
I swear by Kaleidoscope for all of my "diffing" needs. Whether I'm comparing versions of a file, multiple directories, Git merge conflicts, Git history, or anything I need to see the changes in (even images), Kaleidoscope offers a very Mac-assed experience with smooth edges. It's not cheap, and you'll know if you need it. And if you do, you'll love it.
Brett Terpstra
brettterpstra.com