We’re using Team Foundation Server for source control, but Microsoft’s diff/merge tool is CRAP compared to Beyond Compare. We had configured Visual Studio’s TFS integration to use BC for file comparisons, but not for merges. I found a great article on how to configure that (for multiple tools, not just BC) today.
http://blogs.msdn.com/jmanning/articles/535573.aspx
(I haven’t tried merging with this yet, so be sure to test it!)
Update - October 3, 2008
See also http://www.scootersoftware.com/support.php?zz=kb_vcs.php
Development Central is the blog of Bill Sorensen, a professional software developer. Much of this will relate to C#, .NET, and OOP in general.
Disclaimer
These postings are provided "AS IS" with no warranties and confer no rights.