Free file and folder diff & merge tool, Visual Studio integrated.
A Windows utility that compares and synchronizes two folder trees
Advanced tool for folders comparing and synchronizing.