WinMerge is a free diff and merge tool