Apart from diffing files, Meld also supports comparison of folders. It supports three-way comparing and merging and lets you edit files directly from the comparison view.
Being free and open source, Meld is a very popular tool on Windows (it's also available for Linux).
