User:Annew: Difference between revisions
mNo edit summary |
No edit summary |
||
| Line 4: | Line 4: | ||
{|style="text-align:center" | {|style="text-align:center" | ||
|[[Image:Kdiff3_merge.png|250px]]|| ||'''A tool to check, edit and merge differences between 2 or 3 files''' | |[[Image:Kdiff3_merge.png|thumb|250px]]|| ||'''A tool to check, edit and merge differences between 2 or 3 files''' | ||
|} | |} | ||
| Line 25: | Line 25: | ||
::*supports version control keyword and history merging. | ::*supports version control keyword and history merging. | ||
Screenshots showing merge operations are available on '''[http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages]''' | |||
'''[http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form. | |||
Revision as of 10:25, 10 November 2008
I'm annew - aka Anne Wilson. I'm from Yorkshire, in the north of England, and I spend waayyyy too much time working on KDE :-) My interest has long been on user support, so this wiki is the natural extension of that.
Apart from providing support to all family members for their computing problems, I'm interested in gardening, sewing and embroidery, music and reading. In truth, though, little time goes on any of those except reading, these days.
 |
A tool to check, edit and merge differences between 2 or 3 files |
Features
- compares and merges two or three text input files or directories,
- shows the differences line by line and character by character(!),
- provides an automatic merge-facility,
- has an editor for comfortable solving of merge-conflicts,
- provides networktransparency via KIO,
- has options to highlight or hide changes in white-space or comments,
- supports Unicode, UTF-8 and other file encodings,
- prints differences,
- supports version control keyword and history merging.
Screenshots showing merge operations are available on the project's home pages
The KDiff3 Handbook gives a detailed description of activities, in html form.