This page has moved to a new address.
Changing your Visual Studio TFS Merge tool