I’ve finally gotten around to adding some reg files for using WinMerge with VS2013. You can download them from the bottom of my Using WinMerge with TFS post. These reg files will configure VS2013 to use WinMerge for TFS diff/merge operations (no Visual Studio restart is required).
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 blamedPants for the info, but he then accused Eddie. Here are the goods:
In Visual Studio do the following:
While the Merge in Visual Studio is much better than in past versions, if you're a WinMerge fan, then this will come in handy...
Related Past Post XRef:
WinMerge'ing with VS2012/TFS