Using WinMerge in VS2010

My recommended tool for Compare and Merge operation in Visual Studio is WinMerge

Here is how to setup Visual Studio 2010 IDE to use it. Assuming you are using Team foundation Server and WinMerge is already installed


In IDE:
Tools->Options
Expand "Source Control"
Click "Visual Studio Team Foundation Server" link
Click "configure User Tools ..." button

click "Modify ..." for each extension
or click "Add ..." to add new one

You may add .* as an extension which will mean any file extension

Compare:
Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
Arguments: /e /u /wl /wr /dl %6 /dr %7 %1 %2

Merge:
Command: C:\Program Files (x86)\WinMerge\WinMergeU.exe
Arguments: /e /u /wl /dl %6 /dr %7 %1 %2 %4