Configure Visual Studio Team System to use OOP-DIFF

This page explains how to configure Visual Studio Team System to use OOP-DIFF instead of the default merge tool. One of the OOP-DIFF External Diff tool buttons are configured to call the VS merge tool, so you can always revert to that when needed. Currently OOP-DIFF only supports *.vb, *.cs, *.txt so you will need to use another tool for other file types.

Click the Visual Studio menu: Tools / Options.

Expand the Source Control nod

Select Visual Studio Team Foundation

Click Configure User Tools

VS options dialog

Select the compare operation list item and then click the Modify button.

Config user tools

Change the command path to the OOP-DIFF.exe path.

config tool

Reference Old Settings;

Command: C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\diffmerge.exe

Arguments: %1 %2 %6 %7 %5