Thursday, September 08, 2011

Use WinMerge in Visual Studio 2010 and TFS

Shamelessly stolen from Sebastien Lambla:

Go to Tools, Options, Source Control, Visual Studio Team Foundation Server, Configure User Tools...

Add a Compare pointing to WinMergeU.exe and using:

    /e /x /s /wl /dl %6 /dr %7 %1 %2

as a command-line argument.

Repeat the operation for Merge, this time using:

    /e /s /x /ub /dl %6 /dr %7 %1 %2 %4

WinMerge is usually found in:

    C:\Program Files (x86)\WinMerge\WinMergeU.exe

No comments: