Kaleidoscope

是一款很强大的文件和图像比较工具，支持任何文本文件和 jpeg、tiff、png、psd 等格式的图像文件，同时和 git、svn 等版本控制工具能够完美的结合。

Kaleidoscope 2.0.1 | Mac Os X | 22 MB

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?

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

Three-Way Merge

✧ 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

Requirements:

OS X 10.7.3 or later, 64-bit processor

App Store:

https://itunes.apple.com/us/app/kaleidoscope/id587512244

Kaleidoscope 2.0.2 MacOsX