Kaleidoscope 2.2.0 (Mac OS X)

Kaleidoscope 2.2.0 (Mac OS X) | 25 MB

With text merge, three-way merge, folder comparison, and now the ability to ignore whitespace-only differences, Kaleidoscope integrates perfectly with the version-control systems you already use.

It's Part of Your Workflow
- Subversion, Git, Mercurial, Bazaar, and Perforce support
- Integrates 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-merges 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 OS X Lion & Mountain Lion
- Beautiful, modern UI 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