Best merge tool for visual studio and TFS May well be ... http://www.richard-banks.org/2009/09/using-p4merge-with-visual-studio-2008.html