Kaleidoscope is also available for the iPad. Its beautiful user interface and great image diffing capabilities are what set it apart. owners) multiple times, Kaleidoscope is still one of the best diff & merge tools for the Mac. KaleidoscopeĪlthough it has changed hands (i.e. DeltaWalker supports macOS, Windows and Linux. Also, if you're regularly performing comparisons on a folder basis, DeltaWalker shines with a great performance in this area. However, it goes one step further by letting you compare file archives like ZIP, JAR, and TAR files. Just like Araxis, the DeltaWalker app also lets you compare office files. In both the Working Copy and various History / Changeset views, you can now see the actual images - and how they were changed! Try it yourself - for free! DeltaWalker My only annoyance is that it is a little difficult to compile if it isn't present in your favorite distro repository.NEW: Image Diffing in Tower! Our popular Git client Tower now supports Image Diffing for a variety of formats (including PNG, JPG, GIF, BMP, TIFF, JPEG2000, and HEIC). See:Īn advanced feature is to use regular expressions for defining automatic merges.

You can also use it compare and merge directories. In Windows, it has a nice integration with windows explorer: select two files and right click to compare them, or right click to 'save to later' a file, and then select another one to compare. It also solves almost all the ClearCase conflicts. You can configure it as the default diff tool in Subversion, Git, Mercurial, and ClearCase. One of the first tools I install in any machine. It is in the list of my favorite open source software. It is possible to integrate it with Tortoise and with your linux shell.

There's versions for Windows and Linux with the same interface. Kdiff3 conflict resolution algorithm is really impressive.Įven when subversion indicates a conflict, Kdiff3 solves it automatically.

Winmerge mac