Araxis Merge Advanced two and three-way file comparison/merging and folder synchronization.
KDiff3 Text analysis software to spot differences between files and lines.
CodeCompare Free tool for code comparison within Visual Studio environment and a standalone.