Observe, determine, and merge changes for files, folders, or directories in visually appealing text format.
WinMerge is a tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes. WinMerge has Unicode support, Flexible syntax coloring editor, Visual SourceSafe integration, and Windows Shell integration. Regexp filtering for filenames and lines. Side-by-side line difference and highlights differences inside lines. A file map shows the overall file differences in a location pane. The user interface is translated into several languages.
Installs 4 additional applications, some to startup and some as browser plugins. (Enterprise 1.1, SaveSense, KNCTR, Reimage Repair).
Summary
Adware. How rude :(
Functional and fast
jkball
Pros
It's free and open source. It has plugin support. With the xdocdiff plugin you can quickly compare MS Word and Excel documents (.doc, .docx, .xls, .xlsx) as plain text. Integrates well with Tortoise CVS/SVN. Excellent performance.
Cons
Plugins are disabled by default. xdocdiff plugin is a separate download. UI is a bit dated. No support for 3-way compare/merge operations.
Summary
An invaluable tool once you have it set up the way you want it. Take a look at KDiff3 if you need to do 3-way merges.
awesome, reliable, better than my IDE
alexx.stehman
Pros
This tool provides a FAST, easy-to-use, friendly interface for diffing files. Additionally, it has never failed me. It has never crashed and/or corrupted my files.
Cons
There are none that come to mind.
Summary
Highly recommend this tool anytime you need a GUI diff tool.
Love! This software is a gem!
Lahodaweb
Pros
If you have to compare text files you reached the realm. Easy to use. Nice visuals.
Cons
Why do I need to enter 10 chars minimum of cons if there aren't any?
Summary
A well designed tool.
Performs as promised, easy to use, very fast
silviu.zilberman
Pros
Marks differences between lines and in-line, user friendly
Cons
Wish it could compare similar directories and mark files that are changed.
Summary
Highly recommended.
This tool is a must have if you develop websites
coachgm41
Pros
I have to deal with 100s of files for the websites I build and this utility is one of my most important. The keyboard commands make this better than most merge utilities.
Cons
Nothing. I love this software. And its free! Its a crime. I would pay good money for this tool.
Summary
A friend showed me this tool a few years ago and I owe him big. It has saved my tail so many times I can't say. I certainly like the diff tool that comes with SVN but every time I use it I say "dang I need to take two minutes to config SVN to use winmerge instead!". I love this tool!
Wonderful, fantastic, helpful, nice, ..... etc
armorjan
Pros
Added to the context menu
Supports dragging and dropping
Very nice GUI
Cons
Nothing, Nothing
Summary
An invaluable tool to merge & match files & folders.
jamie_stephenson
Pros
Gives lots of control - you can move all or some changes in either direction
Cons
Filters are a bit fiddly to set up. (Hopefully someone has already done the ground work for you)
Summary
Fantastic!
punchup
Pros
Great for comparing two files that are similar. Perfect for CSS style sheets that have slight differences and are messing up your site.
Cons
None. More than I expected.
Summary
User friendky and very simple for a lay man like me.
balatv44
Pros
I am using thins kind of software. It is really very good. Could understand easly and use it. The programme has been developed for every need of al the people. Thanks to Cnet for allowing us to download.