KDiff3 is a program that compares 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 comfortable solving of merge conflicts, and has an intuitive graphical user interface.
|Tags||Software Development Version Control Utilities Text Editors Text Processing|
|Operating Systems||Windows POSIX Linux|
Release Notes: There is an option for treating C/C++ comments as whitespace during diff. In the merge menu, you can choose A/B/C for all unsolved conflicts or for all unsolved whitespace conflicts. In directory comparison, you can do the selected merge operation for the selected item. There are several bugfixes.
No changes have been submitted for this release.