KDiff3 1.11.1 – File and folder diff and merge tool.
KDiff3 is a file and folder diff and merge tool which:
Features:
Compares and merges two or three text input files or folders,
Shows the differences line by line and character by character(!),
Provides an automatic merge-facility,
Has an editor for comfortable solving of merge-conflicts,
Provides network transparency via KIO,
Has options to highlight or hide changes in white-space or comments,
Supports Unicode, UTF-8 and other file encodings,
Prints differences,
Supports version control keyword and history merging.
App requirements:
OS X 10.9 or laterVersion for Apple Silicon
Monetization:
Absolutely Free
