WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files
WinMerge
Beyond Compare - Intelligent Comparison