Your vote:
Free file and folder diff & merge tool, Visual Studio integrated.
Visual file and source code compare utility.
Graphical front end to the diff program.
