QuickDiff
QuickDiff is a wrapper around the popular diff tool on Linux, designed to make viewing the changes between 2 blocks of texts more easy. This allows you to see the difference in text, lists, mails, and config files. It will graphically show you the differences between the 2 textareas by highlighting those areas that have changed. You can then generate a unique URL to share the results with anyone.
Learn more
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
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
Altova DiffDog
DiffDog includes powerful capabilities that let you compare and merge any type of text-based file, with support for Unicode, ASCII, MBCS, and any other file formats. DiffDog allows bi-directional merging as well as direct editing of both compared files. DiffDog automatically creates a backup of each file, allowing you to re-load the original file from the server or disk at any time should you need to start over. The XML differencing and editing features in DiffDog draw on Altova’s legacy as creator of XMLSpy, the world’s leading XML development. With robust features such as well-formedness and validation checking, code completion, DTD/schema based entry helpers, and more, DiffDog is a must-have differencing utility for Web and software developers working with XML.
Learn more
