KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character and line-by-line analysis and a text merge tool with integrated editor for comfortable solving of merge-conflicts. It can also compare and merge directories.