A free source code editor and Notepad replacement.
Compare It! shows you the differences between two files.
Free file and folder diff & merge tool, Visual Studio integrated.