I have found CSDiff to be a great diff tool for the windows platform. Even better, it is a free tool.