WinMerge 17 Apr 2007 Fantastic open source tool (GPL’d) for comparing and merging files in Windows: WinMerge