winmerge.org
WinMerge is an open-source differencing and merging tool for Windows. It compares folders and files, presenting differences in a visual text format, and is useful for determining what has changed between project versions and merging changes. It can be used as a standalone application or as an external differencing/merging tool.