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.
<
To use WinMerge (on SourceForge as well), you have to navigate to Tools > Options > Source Control > Visual Studio Team Foundation Server (Visual Studio 2015; other versions may have this option in slightly different places). On that Option page, select Configure User Tools... and in that dialog, select Add... to add the information for your diff tool.
In the "Configure Tool" dialog, I have set the following information:
.*
Compare
(or Merge
if you want)WinMergeU.exe
/x /e /u /wl /wr /dl %6 /dr %7 %1 %2