SourceGear | DiffMerge | overviewGraphically 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. Windows Explorer Integration. Right-click on any two files in Windows Explorer to diff th
https://meld.sourceforge.net/
Diff Tools and P4 Merge | Perforce Software
