Over a million developers have joined DZone.
{{announcement.body}}
{{announcement.title}}

WinMerge with VS2013, Rory's Done It

DZone's Guide to

WinMerge with VS2013, Rory's Done It

·
Free Resource

Rory Primrose - Using WinMerge with VS2013

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).

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 blamedPants for the info, but he then accused Eddie. Here are the goods:

In Visual Studio do the following:

...

image

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

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

WinMerge 2011

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

Topics:

Published at DZone with permission of Greg Duncan, DZone MVB. See the original article here.

Opinions expressed by DZone contributors are their own.

{{ parent.title || parent.header.title}}

{{ parent.tldr }}

{{ parent.urlSource.name }}