Merge/diff tool settings for TFS integration

Merge/diff tool settings for TFS integration

Beyond Compare

• Instructions (link)

CodeCompare

• Instructions (link)

Add "/environment=standalone" parameter to CodeCompare configuration in Visual Studio (Tools -> Options -> Source Control -> TFS Settings -> Configure User Tools) in order to open diff/merge in a standalone CodeCompare window rather than in Visual Studio. This is my preferred setting.