WinMerge Development Team

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