kdiff3: KDiff3 (KDE4  Comparison and Merge  Files)
kdiff3:
kdiff3: Shows the differences line by line  and  character  by character (!)
kdiff3: Provides  an automatic merge-facility  and an integrated  editor for
kdiff3: comfortable solving of  merge-conflicts. Supports KIO on KDE (allows
kdiff3: accessing ftp, sftp, fish, smb etc.). Unicode & UTF-8 support.
kdiff3:
kdiff3
kdiff3:
kdiff3:
kdiff3: