WinMerge is a fast and easy to use file and folder diffing tool. Lots of hotkeys and easy to use navigation. It gets the job done.