I am using Team Foundation Server (TFS) for Visual Studio 2005.
Whenever i wish to compare two file\'s versions TFS displays a window with the differences.
<
This appears to be a more thorough description of how to use Winmerge in TFS- http://www.neovolve.com/post/2007/06/19/using-winmerge-with-tfs.aspx