Meld

Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and...

• compares three files. it can not only compare three directories but also merge them! Guest • Apr 2017 • 0 agrees and 1 disagrees Disagree   Agree

Free Open Source Mac Windows Linux BSD Python

Beyond Compare

Beyond Compare allows you to compare files and folders. By using simple, powerful commands you can focus on the differences you're interested in and ignore those...

• Most awesome diff/merge tool I've ever used. Only downside is that it's a commercial product and too expensive for casual use. Guest • Feb 2017 • 0 agrees and 1 disagrees Disagree   Agree

Commercial Mac Windows Linux

kdiff3

KDiff3 is a file and directory diff and merge tool which compares and merges two or three text input files or directories, shows the differences line by line and...

Free Open Source Mac Windows Linux

Diffuse

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code. Diffuse is able to compare...

Free Open Source Mac Windows Linux

P4Merge

P4Merge uses color coding to allow users to visualize the differences between file or images. It allows three-way merging among files, and shows side-by-side file/image...

Free Mac Windows Linux

Araxis Merge

Merge is the visual file comparison (diff), merging and folder synchronization application from Araxis. Use it to compare and merge source code, web pages, XML and other...

Commercial Mac Windows

SmartSynchronize

SmartSynchronize is a multi-platform file and directory compare tool. It allows you to compare files or perform 3-way-merges, both with the ability to edit the file...

Free Personal Mac Windows Linux

DiffMerge

DiffMerge is a graphical file comparison program for Windows, Mac OS X and Unix, published by SourceGear. * Integrates with Windows Explorer; adds a shortcut to the...

• Discontinued No releases since October 2013: latest version, 4.2.0, can be still downloaded from the official website.

Free Mac Windows Linux

FileMerge

FileMerge lets you compare one file to another or one directory to another and merge the files or directories together.

Free Mac Xcode

Kaleidoscope

Use Kaleidoscope to spot the differences in text and image files. Review changes in seconds with the worlds most advanced file comparison application.

Commercial Mac

Tkdiff

tkdiff is a graphical diff viewer based on the Tk framework. It is capable of inter-operating with source-control systems like CVS and Subversion to show differences...

Free Open Source Mac Windows Linux BSD Cygwin

Meld - Mac Port

This is actually Meld itself ported to Mac. Doesn't require X and keybinding changed to be adapt Mac shortcuts.

Free Open Source Mac

DeltaWalker

Intuitive, multi-platform application for two and three-way visual file and folder comparison. Use DeltaWalker to compare (diff) and merge files and to compare and...

Commercial Mac Windows Linux

UltraCompare

UltraCompare Professional is folder/file compare utility loaded with features to enable you to compare text files and folders, word documents, and even zip files and jar...

Commercial Mac Windows Linux

Changes

Changes is a powerful application for comparing folders and the files they contain. Anyone who needs to see the differences between folders or files - particularly...

Commercial Mac