Using WinMerge for TFS compare & merge

In the post tfs – using winmerge as your merge/diff tool you can find the commands necessary to use WinMerge for TFS compare and merge.

From Tool, Options, Source Control, Visual Studio Team Foundation Server, Configure User Tools button, Add button:

  • Extension: .*
  • Operation: Compare
  • Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
  • Arguments: /e /wl /dl %6 /dr %7 %1 %2

And then press again the Add button:

  • Extension: .*
  • Operation: Merge
  • Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
  • Arguments: /ub /dl %6 /dr %7 %1 %2 %4

Finally, in the article diff/merge configuration in Team Foundation - common Command and Argument values you can find the tutorials to using other compare & merge tools in TFS.