There are tons of code comparison / merge tools out there, both paid ones (Araxys Merge, Beyond Compare, Compare It) and free ones (DiffMerge, WinMerge, WinDiff). I use DiffMerge because it’s free and has all the features I need.
Here are notes for myself on how to configure Visual Studio (specifically its TFS source control plug-in) to use DiffMerge as its code comparison tool.
Basically, go to Options / Source Control / Visual Studio Team Foundation Server / Configure User Tools / Add and enter following:
- Extension: .*
- Operation: Compare
- Command: full path to DiffMerge executable
- Arguments: /title1=%6 /title2=%7 %1 %2
and another one:
- Extension: .*
- Operation: Merge
- Command: full path to DiffMerge executable
- Arguments: /title1=%6 /title2=%8 /title3=%7 /result=%4 %1 %3 %2
The original instructions can be found on the following blogs:
Tags: