Clever Geek Handbook

VS2010 uses WinMerge, but Pending Changes TFS2010 tab uses DiffMerge

from VS2010, if I select compare from the context menu, WinMerge is used, but when doing a merge with TFS2010 tools in VS (Pending Changes tab) it insists on using the defautl diffmerge utility which sucks.

Where can I configure TFS to use my own diff / merge tool?

+3


source to share


2 answers


http://blog.paulbouwer.com/2010/01/31/replace-diffmerge-tool-in-visual-studio-team-system-with-winmerge/

Visual Studio setup



Open Source Control> Visual Studio Team Foundation under Tools> Options in Visual Studio.
Click Configure User Tools ... and the Configure User Tools dialog box appears.

Remember to restart Visual studio to load the config.

+4


source


Download the reg file , import into regedit.exe and you're done! Or, if you want to do it manually in Visual Studio, follow these steps:

Click on Tools menu
Click on Options menu item
Expand Source Control tree item
Select Visual Studio Team Foundation Server tree item
Click on Configure User Tools... button

Comparison

To use WinMerge as a Compare / Diff tool:

Click the Add... button
For Extension, type *
For Operation, select Compare
For Command, browse for C:\Program Files\WinMerge\WinMerge.exe
For Arguments, type /x /e /ub /wl /dl %6 /dr %7 %1 %2
Click OK to accept


Merge

To use WinMerge as your merge tool:

Click the Add... button
For Extension, type *
For Operation, select Merge
For Command, browse for C:\Program Files\WinMerge\WinMerge.exe
For Arguments, type /x /e /ub /wl /dl %6 /dr %7 %1 %2 %4
Click OK to accept

Note. To complete the merge before exiting the screen, you need to click the Save button on the toolbar within the WinMerge merge.

+2


source






More articles:


All Articles