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
Compare It!
New version of Compare It! makes your file compare and file merge tasks even easier! With a multitude of new features, you can quickly visually identify differences between files, merge them with a single click, and print/publish your work without any problems! Now true editing is possible within comparison panes, with full support of mouse and keyboard operations, clipboard, bookmarks, etc. Simplify comparison of structured files by using key fields. Syntax highlighting will be useful for all software/web developers. Built-in support for C++, Java, C#, Delphi, HTML + custom syntax files. Word wrapping within editor pane, now you can easily see changes in long lines without having to scroll view. Compare It! can detect and visualize moved sections, similar to what well-known WinDiff does. Compare It! displays 2 files side-by-side, with colored differences sections to simplify analyzing.
Learn more
NextDiff
NextDiff is a free Windows utility for comparing files and folders in a clear visual interface. It helps users inspect differences between two versions of a text file, source code file, log, script, or configuration file. The side-by-side comparison view highlights added, removed, and changed lines, while in-line change marking helps identify the exact modified fragments. NextDiff also supports folder comparison, direct editing, copy-left/copy-right merge actions, difference navigation, and flexible options for ignoring case, blank lines, and whitespace. It is a useful freeware tool for developers, administrators, writers, and anyone who regularly works with changed files.
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
