Diffinity

A diff and merging tool with focus on accurate and easy to read source code diffs.

Free Windows

FileMerge

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

Free Mac OS X Xcode

Compare It!

Easily compare and merge text files; compare doc, xls and pdf files; prepare comparison reports and printouts.

Commercial Windows

WinMerge JP

winmerge jp is a fork of original winmerge that incorporates many own features including 3-way compare, high dpi support and many more.

Free Open Source Windows

Kompare

Kompare is a GUI front-end program that enables differences between source files to be viewed and merged.

Free Open Source Linux KDE

Diff Checker

Diff Checker is a free online diff tool that quickly and easily gives you the text differences between two files.

Free Linux Web

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 between a local copy and a repository version.

Free Open Source Mac OS X Windows Linux BSD Cygwin

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 software and web developers - will find Changes useful.

Commercial Mac OS X

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 OS X

Diff Doc

Compare Files Using ' Diff Doc' a visual file compare and folder compare utility that creates a detailed file diff. File comparison can optionally be done with the command line.

Commercial Windows

GNU Diff Utilities

GNU Diffutils is a package of several programs related to finding differences between files.

Free Open Source Linux

CompareMerge

CompareMerge is a Mac OSX's software tool for file comparison and merging text-like files. It is useful for determining what has changed between versions, and then...

Commercial Mac OS X

LopeEdit

[be careful during the installation: forum ] lopeedit is a powerful programmers...

Freemium Windows

SemanticMerge

SemanticMerge - The diff and merge tool that understands C#, Vb.net, Java and now C

Commercial Windows Linux

DiffPlug

DiffPlug is a free text editor/differ and image viewer/differ. Purchasing a license allows you to diff other kinds of files such as Simulink.

Freemium Windows

Workshare Compare

Workshare Compare is the leading document comparison software that lets you perform file comparison of two documents against multiple modified versions.

Commercial Windows

xxdiff

xxdiff is a QT based graphical file and directories comparator and merge tool. It provides comparing two files, three files.

Free Open Source Mac OS X Windows Linux

VisualDiffer

Visualize folders side-by-side and find immediately which files are different, colors help to understand the diff type. Colors identify older, modified and newer files.

Commercial

Guiffy SureMerge

Guiffy is a diff merge tool and folder compare application and API. SureMerge is the most trustworthy source code 3-way merge tool available. Advanced features include...

Commercial Mac OS X Windows Linux Eclipse NetBeans