SourceGear DiffMerge

Graphically shows the changes between two files, including intra-line highlighting and full support for editing. Allows automatic 3-way merging (when safe to do so) and full control over editing the resulting file. Configurable rulesets and options provide for customized appearance and behavior.
License Free
File Size 6.93 MB
Version 3.3.2
Operating System Windows 7 Windows Windows Vista Windows 2000 Windows XP Windows NT Windows Server 2008 Windows 2003