Spot the differences. Merge in seconds.
Now with text merge, 3-way merge, and folder comparison, Kaleidoscope integrates perfectly with the version control systems you already use.
Who says powerful developer tools can’t be beautiful too?
Praise for Kaleidoscope
"Kaleidoscope epitomizes the concept of “versatile software”: anyone can pick it up and use it, and the app will “scale” according to a user’s needs." - Federico Viticci, MacStories.net
"Kaleidoscope 2 is breeze. I wish I'd had something like Kaleidoscope when I wrote my first novel, and I'll be counting on it when I finally get around to writing the next one." - Rene Ritchie, iMore.com
"It’s beautifully designed, fast and wonderful to use. It’s become an essential part of my toolkit already." - Matthew Panzarino, The Next Web
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
"The new Kaleidoscope is great, and has awesome and committed people behind it. Devs and designers need this tool." - @SteveStreza
"I just bought Kaleidoscope app! It has already saved my time greatly once (by comparing SQL from clipboard). Thank you!" - @befive_info
"Kaleidoscope 2 is the best merging tool for the Mac, hands down. I finally don't miss BeyondCompare." - @stefankendall
Thank you for being our customers! We've got a great update for you with a lot of tweaks and fixes to make using Kaleidoscope even better. As always, please send any feedback, feature requests, or bug reports to email@example.com.
✧ Improved the visual appearance of the change count stepper in Text Scope.
✧ Fixed the "Reset Selection" menu item in Text Scope to enable and disable properly.
✧ The Save menu is now properly disabled when comparing text snippets.
✧ Fixed a bug where the summary text in document titles and tabs might not properly update.
✧ The Resolved document in Three Way Blocks now has better alignment with similar content in A and B.
✧ Kaleidoscope can now properly diff .textClipping documents.
✧ User-defined system date formats will now be properly used.
✧ Fixed a bug that prevented Folder Scopes table of files and folders not have keyboard focus by default.
✧ Kaleidoscope now handles different color spaces more reliably in Image Scope.
✧ Kaleidoscope now properly accounts for camera orientation when displaying images in Image Scope.
✧ Improved keyboard navigation in changesets.
✧ Unsaved files will now be properly marked as dirty in changesets.
✧ Changesets now properly select the list of files on the left when opening, allowing you to quickly review changes.
✧ If you ask Kaleidoscope to move itself to the Applications folder, it will no longer move itself to ~/Applications if that folder exists. It will now move to /Applications in all cases.
✧ Fixed a bug that caused the corner radii of windows in Full Screen to not match.
✧ Fixed an issue that sometimes led to poor vertical alignment in the File Shelf.
✧ Dragging files to Kaleidoscope will properly open to a comparison document and will no longer leave the launch window open in the background.
✧ Fixed a bug that caused accessing files from the Recents list to sometimes stop working.
✧ Improved the messaging if Kaleidoscope is unable to open a document that was previously available via AFP.
Keep on diffin'!
Share with Others
- Last changed:
- Mar 05, 2013
- Developer Tools
- Black Pixel
- Average Rating:
- 4.50 (11)
- 22.1 MB