Devart Code Compare

Devart Code Compare screenshots

Free file and folder diff & merge tool, Visual Studio integrated
Main Window
Devart Code Compare 4.1 : Main Window

Alternative downloads

Beyond Compare
Compare files and folders and reconcile differences in various file types.
Compare and Merge
Visual file and source code compare utility.
Compare Suite
Provides file and folder comparison with merging and reporting abilities.