KDiff3/ro

From KDE Wiki Sandbox
Revision as of 13:37, 31 December 2010 by IulianB (talk | contribs) (Created page with "'''O unealtă pentru a verifica,edita și îmbina diferențele dintre 2 sau 3 fișiere'''")
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
  O unealtă pentru a verifica,edita și îmbina diferențele dintre 2 sau 3 fișiere

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.