About Kaleidoscope
Kaleidoscope is a visual diff and merge tool for Mac. It compares text, images and whole folders, and it works closely with Git so you can review changes without leaving your project.
What it does
Kaleidoscope shows the differences between two files, two folders or two commits. For Git users it adds a three-way merge view that shows the commits leading to a conflict, along with the changes made on each side of the base. A file history view lets you browse earlier revisions of a file and compare them.
Key features
- Character-level text comparison with unchanged areas collapsed
- Three-way merge view for resolving conflicts
- Image comparison with split, blink and drag modes
- Folder comparison with items you can copy across
- File history with commit details
Who it's for
Developers who review code or resolve merge conflicts in Git will get the most from it. Designers who need to check changes between versions of an image will find the image tools useful as well.
Pricing and good to know
The site has a pricing page and offers a free trial. Kaleidoscope is a desktop app for Mac, so it does not run in a browser or on Windows or Linux. Its Git features work with the repositories you already have on your machine.
Highlights
- Compare text at character level, with unchanged areas collapsed
- Three-way merge view showing changes from the base to each side
- Compare images as a split, blink or drag view
- Compare whole folder trees and copy items across
- Browse the full history of a file with commit details
