Sponsor: Aleix Pol
KDiff3 is a diff and merge program that compares or merges 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, supports Unicode, UTF-8 and other codecs, autodetection via byte-order-mark "BOM" supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), Printing of differences, Manual alignment of lines, Automatic merging of version control history ($Log$), and has an intuitive graphical user interface. Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension included in installer (originally by Sergey Zorin: see also Diff Ext) KDE-Konqueror/Dolphin service menu plugin Simplified integration with IBM-Rational-Clearcase for Windows (Details). Read what else is special in a short abstract (PDF).
Michael Reeves <[email protected]>
Manifesto Compliance Plan
Everyone is welcome to join.
It's a widely used tool for merging matches.
The project used to be developed by someone else who wouldn't oppose. We should try to get him on the next call.
It's for patches users mainly.
|DONE||Project team||Michael Reeves mostly|
|DONE||Manifesto compliance plan||All looks good for now.|
|DONE||Repository and code available (in playground)||in kde:kdiff3|
|DONE||Mailing list available||Will be using [email protected]|
|DONE||Website available||We don't really have access to the previous website, it's not a priority for the project|
|DONE||Active community||Have an e-mail to kde-community and a blog post which should be on the planet.|
|DONE||Manifesto compliance||We don't see any conflicts nowadays.|