Compare and Merge
Compare and Merge is the Windows file compare utility for detecting and merging differences between text files and folders, compare source code, compare program output, etc. Compare and Merge shows you the differences between files side-by-side and makes it easy to resolve these differences. Source code, output files, HTML, XML, etc. Compare source code to older versions and identify what has changed. C++, Visual Basic, Perl, PHP, Delphi, etc. Merge your changes and those of your co-workers into one master copy. Select and click to merge a single line or an entire section of text. Unlimited undo/redo. Analyze file differences for entire folder branches. Can be used directly from the Explorer's context menu. Many customization options, fonts, colors, comparison algorithm. Works like a text editor, you can fully edit text while comparing, with dynamic refreshing. Summary bar gives quick feedback of all differences.
Learn more
Code Compare
Over 70,000 users actively use Code Compare while resolving merge conflicts and deploying source code changes. Code Compare is a free compare tool designed to compare and merge differing files and folders. Code Compare integrates with all popular source control systems, TFS, SVN, Git, Mercurial, and Perforce. Code Compare is shipped both as a standalone file diff tool and a Visual Studio extension. Download Devart Code Compare and manage code changes with ease! Colored blocks for inserted, deleted, and modified text. Collapsing of unchanged text regions (CodeCompare Pro-feature). Editing files on the fly with a reliable file compare tool. Compare code without leaving your favorite environment. Link Code Compare to Android Studio as an external tool to compare and merge code. Integrates with version control systems as the merging tool for conflicting file revisions. Three-way comparison to compare and merge three files side-by-side.
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
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