Geek Software of the Week: WinMerge!
How cool is this? A Windows merging tool that is Open Source (and therefore FREE!) Check it out!
“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.
WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application.”