Details on how to configure Visual Studio to use WinMerge for merge and compare operation is documented in http://blog.paulbouwer.com/2010/01/31/replace-diffmerge-tool-in-visual-studio-team-system-with-winmerge/ .
String of thoughts on science, technology and programming