Almost beats Subversion but merging tool needs one small detail - when you have two upper windows with original and new source code and you scroll one of the windows left or down - Subversion automatically scrolls the another. That's very useful.

If TFS team will fix this small thing - Team System will tie again vs Subversion...