winmerge is an open source differencing and merging tool for windows. winmerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.