There are plenty of posts about configuring alternative diff/merge tools to use with Team Foundation Server. The one I liked the most is http:…