KDiff3 0.9.97

KDiff3 shows you line-by-line and character-by-character differences between two or three files. Quickly merge the files into one using the built-in automatic merge functions, and solve merge conflicts easily with the integrated editor. In addition, KDiff3 automatically merges the version control history to help you keep track of changes.