http://winmerge.org/

winmerge

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

WinMerge Download : http://winmerge.org/