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
TortoiseGit
TortoiseGit is a Windows Shell Interface to Git and based on TortoiseSVN. It's open source and can fully be build with freely available software. Since it's not an integration for a specific IDE like Visual Studio, Eclipse or others, you can use it with whatever development tools you like, and with any type of file. Main interaction with TortoiseGit will be using the context menu of the Windows explorer. TortoiseGit supports you by regular tasks, such as committing, showing logs, diffing two versions, creating branches and tags, creating patches and so on. TortoiseGit provides overlay icons showing the file status, a powerful context menu for Git and much more. It is developed under the GPL. Which means it is completely free for anyone to use, including in a commercial environment, without any restriction. The source code is also freely available, so you can even develop your own version if you wish to.
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
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
