WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle. 32 languages. With the xdocdiff-Plugin you even can compare Word, Excel, PowerPoint, PDF and some more files.
Since version 2.16 it's a a mirror release of a fork WinMerge JP.
Features Visual differencing and merging of text files. Flexible editor with syntax highlighting, line numbers and word-wrap. Handles DOS, Unix and Mac text file formats. Unicode support (as of version 2.8.0, UTF-8 files are correctly read without a BOM). Difference pane shows current difference in two vertical panes. Location pane shows map of files compared. Highlights differences inside lines in file compare. Can also generate HTML report with differences highlighted. Regular expression based file filters in directory compare allow excluding and including items. Moved lines detection in file compare. Ability to ignore whitespace and letter case changes. Creates patch files. Shell integration (supports 64-bit Windows versions). Rudimentary Visual SourceSafe and Rational ClearCase integration. Archive file support using 7-Zip . Plug-ins. Language localization via plain-text PO files. Online manual and installed HTML help manual. Generates normal, context, and unified patches.