WinMerge

WinMerge awards

Compare both files and folders, displaying differences in visual text form