Kaleidoscope 2.4.2 macOS | 24.8 Mb

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.

→ There’s no comparison.
Kaleidoscope is an integral part of the creative and professional process. Use it to unravel the complexity between multiple versions of a text file, image, or folder. Use it to get more done.

• Text Scope: Every word matters - Diff plain text files, native code, HTML, and .docs. Drill all the way down to line and character-level changes.
• Image Scope: Every pixel counts - With exceptional performance and multiple modes, Kaleidoscope makes reviewing images fast, simple, and beautiful.
• Folder Scope: Make things simple - Compare any two directories or folders side-by-side to understand the intricate differences between them.
• Your Workflow: Be more productive - Seamless integration with Git, SVN, and Mercurial.

→ Developing superpowers.
Integration with the Xcode debugger and the enhanced ksdiff tool give you even more power to spot important differences.

• Compare Output: When differences count - Use the new ksp and kspo debug commands to send any debug output to Kaleidoscope.
• Images, too: Worth a 0x03E8 words - Send image data to see exactly what’s going on.
• Brakpoints: Let them work for you - Use breakpoints to automate the process of sending content when it’s most valuable, and compare later.
• | ksdiff -: Integrate the ksdiff tool with anything you can do on the command-line. Also work with images.

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
- Integrate with the Xcode debugger for text and graphics

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

Powerful Image Comparison
- Compare images side by side, stacked, or split
- Spot subtle pixel differences with a high contrast “difference mask”

Optimized for macOS
- Beautiful, modern UI made 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

Home Page - https://kaleidoscope.app/