WinMerge

From Axaptapedia

http://winmerge.sf.net

"WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions."