WinMerge
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...
What is WinMerge?
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.
WinMerge Screenshots
WinMerge Features
WinMerge information
- Developed byThingamahoochie Software
- LicensingOpen Source (GPL-2.0) and Free product.
- Written in
- RatingAverage rating of 4.7
- Alternatives57 alternatives listed
Supported Languages
- English
GitHub repository
- 3,796 Stars
- 570 Forks
- 238 Open Issues
- Updated
Comments and Reviews
Tags
- Diff Tool
- merge-folders
- compare-xlsx
- compare-pptx
- compare-pdf
- text-compare
- compare-docx
- merging
3 pane compare. Extremely useful for resolving conflicts when programming.
Very easy to use, and very powerful conflict manager where you can pick the changes from either side, save at the end, and look over nested file structure.
A great program for those who want to get into intensive file merging. I do, however, think that there should be a simplified method for merely appending one file to another.
Just needed to find why two folders had different qty of items. WM found the "missing" files in a couple of seconds. Easy-peasy.
Versatile and fast! Fires up in milliseconds.
Works well with comparing folders and files.
Very good app, unfortunately it doesn't have the capability to output difference reports like BC. In most engineering environments this is a must.
[Edited by NuncioBitis, April 13]