In order to set Beyond Compare (or other custom tool) as the default tool for diff/merge operation in Team Foundation Server plugin for Visual Studio, do the following:
TEAM FOUNDATION SERVER (TFS)
Diff
- In Visual Studio Choose Options from the Tools menu.
- Expand Source Control in the treeview.
- Click Visual Studio Team Foundation Server in the treeview.
- Click the Configure User Tools button.
- Click the Add button.
- Enter ".*" in the Extension edit.
- Choose Compare in the Operation combobox.
- Enter the path to BComp.exe in the Command edit.
- In the Arguments edit, use:
%1 %2 /title1=%6 /title2=%7
3-way Merge (v3 Pro)
- Follow steps 1-6 above.
- Choose Merge in the Operation combobox.
- Enter the path to BComp.exe in the Command edit.
- In the Arguments edit, use:
%1 %2 %3 %4 /title1=%6 /title2=%7 /title3=%8 /title4=%9
2-way Merge (v3 Std, v2)
Use the same steps as the 3-way merge above, but use the command line:%1 %2 /savetarget=%4 /title1=%6 /title2=%7
Source: Beyond Compare support (link)
No comments:
Post a Comment