KDiff3

KDiff3 is a tool for Windows that lets you compare the contents of two or three files and directories. It shows the differences between the files when working with different folders.

When working with single files, the program allows you to see the differences between them line by line and character by character. KDiff3 highlights the different parts by using different colours. It is particularly useful for detecting the presence of white space and tabulations.

With support for Unicode and other encoders, KDiff3 includes an automatic merge function and an integrated editor for resolving and merge conflicts arising from this process, printing of differences, manual line alignment, integration with the Windows shell, and so on.