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 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
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
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
