Free file and folder diff & merge tool, Visual Studio integrated.
Provides full management over your files with batch renaming support.
It provides file and folder comparison with merge and reporting abilities.