Kaleidoscope

About

Kaleidoscope is a Mac app for comparing and merging text files, images, and entire folders. Its text compare shows character-level diffs and collapses unchanged areas, while its image compare offers pixel-level diffing with split, blink, drag, and diff views. Directory compare shows folder trees at a glance, with inline diffs, Quick Look, and the ability to copy items from one folder to the other.

Kaleidoscope deeply integrates with Git. File History lets you browse and compare all revisions of a file, with details about each commit. 3-Way Merge shows the Git commits leading to a conflict, with commit messages available alongside. The Changeset view puts all changes between two commits in one place, stays live with your working copy, and can be filtered by modification, file type, and file name.

Reviewers describe Kaleidoscope as a polished, Mac-native tool that is especially useful for diff and merge work, and they note that it is not cheap. A free trial is available.