WinMerge

WinMerge is an Open Source differencing and merging tool for Windows