Kaleidoscope 2 is a just released update to Black Pixel's app for comparing text, files, and folders.
Kaleidoscope is commonly used by developers to compare code but can be used by anyone who needs to quickly spot the differences between files or documents.
Now with text merge, 3-way merge, and folder comparison, 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
✧ 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
You can purchase Kaleidoscope from the App Store for a limited time price of $34.99.