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
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
Draftable
Draftable is an Enterprise-Grade Document Comparison Software that lets users easily spot changes between documents.
Draftable’s product suite includes Draftable Online for browser-based comparisons, Draftable Desktop for secure computer-based comparisons, and Draftable API for integrating our dynamic technology into your app.
The software features synchronized side-by-side view and a change list that presents all modifications in one place. Users can also export comparisons to a PDF, view text style changes, and compare different file types such as PDF, Word, PowerPoint, and Excel.
Draftable is easy to use, completely secure, and enterprise-ready. Having been used to compare over 10 million documents, it has been perfected and honed for heavy-duty use.
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
