paulbouwer.com

I have been using Visual Studio Team System 2008 for a while now and am really starting to like the tightly integrated source control and work item functionality. One thing I cannot get used to is the basic diff/merge tool.

Quick Guide

This quick guide offers a no frills/get things done approach to replacing the diff/merge tool in Visual Studio Team System with WinMerge. There is a detailed guide for those that want to have a little more detail.

Quick Steps

1. Download and install WinMerge.
2. Open the Configure User Tools dialog for Team Foundation based source control in Visual Studio. Tools > Options > Source Control > Visual Studio Team Foundation > Configure User Tools
3. Add the details for the Compare (diff) Tool by clicking on the Add… button. Extension: .* Operation: Compare Command: C:\Program Files\WinMerge\WinMergeU.exe Arguments: /e /u /wl /wr /dl %6 /dr %7 %1 %2
4. Add the details for the Merge Tool by clicking on the Add… button. Extension: .* Operation: Merge Command: C:\Program Files\WinMerge\WinMergeU.exe Arguments: /e /u /wl /dl %6 /dr %7 %1 %2 %4