WinMerge

Compare and merge files or directories