WinMerge is a tool for visual difference display and merging, for both files and directories. It is highly useful for determining what has changed between file versions, and then merging those changes.