WinMerge'ing with VS2012/TFS

Rory Primrose - Using WinMerge with VS2012

My Using WinMerge with TFS post has to be consistently the most viewed post on this site. I have finally been able to get around to posting updated reg files to support VS2012 on both x86 and x64 platforms (see the bottom of that post for the links). These reg files will configure VS2012 to use Winmerge for TFS diff/merge operations (no Visual Studio restart is required).

Rory Primrose - Using WinMerge with TFS

Someone at work was kind enough to figure out the correct command line switches to use in order to replace the standard TFS compare/merge tool with WinMerge. I originally blamed Pants for the info, but he then accused Eddie. Here are the goods:

In Visual Studio do the following:

• Click on Tools menu
• Click on Options menu item
• Expand Source Control tree item
• Select Visual Studio Team Foundation Server tree item
• Click on Configure User Tools... button

... [Scroll down to the bottom of the post]

Related Past Post XRef:
Check in Doc's, Xlx's, Pdf's to TFS? Wish you could Diff/Compare them? But they are 'binaries' you say! WinMerge and XDocDiff says different...
WinMerge 2011

Don't be difficult, DiffMerge! Using the free DiffMerge with SourceSafe, TFS & SVN
SourceGear DiffMerge - Free Cross Platform GUI Diff & Merge Utility