kdiff3
Open SourceKDiff3 is a versatile graphical file and directory comparison and merging tool, designed to help users identify differences, merge changes, and synchronize files and folders efficiently. It supports comparing up to three files or directories simultaneously, offering detailed character-by-character analysis and a robust merge editor.