KDiff3 Overview
KDiff3 is a free, open-source file and directory comparison and merge tool for Windows, macOS, and Linux from the KDE community. It can compare and merge two or three files or directories at once, showing differences with clear highlighting and offering an automatic merge for non-conflicting changes plus an interactive editor to resolve conflicts. Its three-way merge with a common base makes it especially useful as a merge tool for version control systems, and it handles Unicode and many encodings. As a capable, no-cost diff/merge tool, it is widely used as a Git or other VCS merge helper. The full offline installer bundles the application and installs without an internet connection. It can be set as the default diff and merge tool for Git and other systems, opening automatically to resolve conflicts. This page links to the official KDiff3 download.