With text merge, three-way merge, folder comparison, and the ability to ignore whitespace-only differences, Kaleidoscope integrates perfectly with the version-control systems you already use. Spot the differences. Merge in seconds.
- Download Link
- Supported Operation Systems
- Features
- Screenshots
- Whats new?
- macOS 10.12.0 or later, 64-bit processor
Easy Workflow Integration
- Subversion, Git, Mercurial, Bazaar, and Perforce support
- Works as a fully functional diff or merge tool
- Supported by a growing list of GUI source control management apps
Two-Way Text Comparison & Merging
- Three powerful display modes
- Super-fast diffing of lines and character-level changes
- Color coding to spot added, deleted, and changed text
Three-Way Merge
- Review code changes and resolves conflicts
- Intelligently auto-merge the right content
File & Folder Comparison
- Ultra-fast algorithm for finding differences in large folders
- Sort and filter down to what matters most
- Drill deeper into folders for more detailed comparisons
- Copy your preferred files across sources
Powerful Image Comparison
- Compare images side by side, stacked, or split
- Spot subtle pixel differences with a high contrast “difference mask”
Optimized for macOS
- Beautiful, modern UI made to feel at home on your Mac
- Full-screen mode for focusing on your content
- Looks gorgeous on retina displays and works wonderfully with high-resolution graphics
- If comparisons take more than a few seconds, a progress bar will now give you an indication for the maximum wait time.
- If the document running the comparison is no longer in front when the comparison is finished, you will get a user notification.
This is not for Apple silicon. It asks for Rosetta 2 when trying to run it.