Semantic Merge / Diff Tool

This looks pretty promising.  A diff and merge tool that understands the syntax of your code.

Check it out!

Documentation on how to use it as the merge and diff tools with TFS.