Using winmerge as a merge tool in Visual Studio Team Suite

This article by Sebastien Lambla facilitates getting WinMerge (found here) to run inside Visual Studio. I am using it in VS 2008, not sure of what other versions this configuration works with. Very useful since the built-in merge is not very good.

SerialSeb: Using winmerge as a merge tool in Visual Studio Team Suite

Synopsis:

In menu: Tools > Options > Source Control > Visual Studio Team Foundation Server

press [Configure User Tools…] button

select [Add…]

select operation: Compare, command to winmergeU.exe and the following arguments:

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

Click Add again, select operation Merge and use these arguments:

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

Hello WinMerge!