WinMerge
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. WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application. In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible: General Supports Microsoft Windows XP or newer. Handles Windows, Unix and Mac text file formats. Unicode support. Tabbed interface. File Compare 3-way File Comparison New! Visual differencing and merging of text files. Flexible editor with syntax highlighting, line numbers and word-wrap. Highlights differences inside lines.
Learn more
TortoiseMerge
Version control is all about having the history of your working progress. But to really see and check the history, you must be able to see and check what has changed between two points in time, for example, what has changed between two releases of your product, or what was changed to fix a bug, etc. This is where TortoiseMerge helps. It is a diff/merge software tool for Windows with a tight integration for TortoiseSVN. At least for files that consist of text, TortoiseMerge can help you here. It shows you the two versions of a file side-by-side, coloring every modified line in that file. When you reformat your code or text, sometimes you don't really change anything but only split a long line into multiple ones, or you merge multiple lines into one. TortoiseMerge marks such changes with a white circle on the left gray bar of each view. If you see such a white circle, you know that no real changes were made, only changes in whitespaces.
Learn more
Beyond Compare
Compare files and folders using simple, powerful commands that focus on the differences you're interested in and ignore those you're not. Merge changes, synchronize files, and generate reports. Directly access FTP sites, media devices, WebDAV resources, svn repositories and cloud storage. All from your Windows, macOS or Linux workstation. Beyond Compare includes built-in comparison viewers for a variety of data types. In addition to text, compare tables, images, binary files, registry hives, and much more. Beyond Compare allows you to quickly and easily compare your files and folders. By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. You can then merge the changes, synchronize your files, and generate reports for your records. You can compare entire drives and folders at high speed, checking just sizes and modified times.
Learn more
DiffMerge
DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file. Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different. Right-click on any two files in Windows Explorer to diff them immediately. Rulesets and options provide for customized appearance and behavior. Identical feature set on Windows, OS X, and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.
Learn more