How do I replace the merge tool in Visual Studio/T

问题:

Please, someone tell me that there is some way to replace the Merge Tool in TFS. I've already swapped out their diff tool with my preferred tool.

回答1:

Yes, it's "easy". See this list of common diff/merge tool configurations.

(You can even use merge tools that work!)

回答2:

You can use BeyondCompare or Araxis Merge for code comparison and merging. Both are paid commercial applications, but integrate well with Visual Studio environment.