Differ

About Differ

Differ is a modern desktop application for file comparison and merging. It supports side-by-side diff with syntax highlighting, three-way merge with conflict detection, recursive directory comparison, and AST-based syntax-aware hunk regrouping.