With text merging, three-way merging, folder comparison, and the ability to just ignore whitespace differences, Kaleidoscope integrates perfectly with the version control systems you already use.
Easy Workflow Integration – Support for Subversion, Git, Mercurial, Bazaar and Perforce – Works as a fully functional diff or merge tool – Supported by a growing list of GUI source control management applications
Two-Way Text Comparison and Merge – Three powerful viewing modes – Super-fast separation of lines and character-level changes – Dot color coding of inserted, deleted and replaced text
Three-Way Merge – Examine code changes and resolve conflicts – Intelligently automatically merge the right content
File and Folder Comparison – Ultra-fast algorithm to find differences in large folders – Sort and filter by what’s most important – Go deeper into folders for more detailed comparisons – Copy your preferred files between sources
Powerful Image Comparison – Compare images side by side, stacked, or split – Identify subtle pixel differences with the high-contrast “difference mask”Optimized for MacOS – Beautiful, modern user interface designed to make you feel at home on your Mac – Full-screen mode for focusing on your content – Looks great on Retina displays and works great with high-resolution graphics.
Turbobit 39 MB .dmg
Add Comment