Spot the differences. Merge in seconds. 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.
FEATURES
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 resolve 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
Compatibility: macOS 11.1 or later (Apple Silicon compatible)