WinMerge

WinMerge is a program for comparing and synchronizing files and directories.

Features

• visual comparison and synchronization of text files;
• flexible editor with syntax highlighting, line number display and automatic text transposition;
• supports DOS, UNIX, and Macintosh text file formats;
• directory comparison;
• can create patches;
• syntax highlighting for many programming languages, such as C/C++, Java, Pascal, Basic, JavaScript, Python;
• support for multiple code pages;
• integration with version control systems TortoiseSVN (Subversion), TortoiseHg (Mercurial), Microsoft Visual SourceSafe and Rational ClearCase;
• archive management with 7-Zip.