kdiff3

KDiff3 is a program that:

Compares or merges two or three text input files or directories
Shows the differences line-by-line and character-by-character
Provides an automatic merge facility and an integrated editor for
solving merge conflicts
Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.)


          

---

License: GPL-2.0-or-later
URL: https://apps.kde.org/kdiff3