WinMerge Development Team

A tool for visual difference display and merging, comparing directories and various types of files, including text, image and tables, to identify and merge changes between versions