I'm going to check it out - it's included in with Vault 4.0 and Fortress 1.0, but they also released as a free tool for everyone.

http://software.ericsink.com/entries/DiffMerge.html