Hello All,
Here is a awesome tool to help with upgrade file changes and it's free too!
http://sourcegear.com/diffmerge/index.html
Spend the time to learn how to use it and you won't be sorry. I don't know if this is the best tool or not but it works great for me.
Paul