“Kaleidoscope is one of the world’s best tools for spotting differences in images and text, and now it supports merging of files and folders, too. Kaleidoscope integrates directly with Git, Subversion, Mercurial, and Bazaar to fit perfectly in your workflow.”
Price is 50% off during the public beta. Purchase for $34.99 (future price $70) from within the beta version of the app.
Now available in the 
More Current Deals:
Tags: development