I’ve become a huge fan of a program called Meld in Linux. It allows me to compare files, folders and even update CVS repositories (in a basic way). It’s cool
Thankfully, there is a very similar program available for Windows and also Open Source called WinMerge. This does pretty much the same thing and works in a very similar way.
It’s great for comparing registry files between different computers and different folder structures.