kdiff3: kdiff3 (A compare and merge tool for KDE. From KDE Extragear)
kdiff3:
kdiff3: KDiff3 is a graphical text difference analyzer for up to 3 input 
kdiff3: files, provides character-by-character analysis and a text merge tool
kdiff3: with integrated editor. It can also compare and merge directories.
kdiff3:
kdiff3:
kdiff3:
kdiff3:
kdiff3:
kdiff3: