KDiff3: Difference between revisions

    From KDE UserBase Wiki
    m (Remove links to old unmantained website)
    (formatting tweaks)
    (3 intermediate revisions by 2 users not shown)
    Line 19: Line 19:
    *prints differences,
    *prints differences,
    *supports version control keyword and history merging.
    *supports version control keyword and history merging.
    <!--T:5-->
    [https://docs.kde.org/trunk5/en/extragear-utils/kdiff3/index.html The KDiff3 Handbook] gives a detailed description of activities, in html form.


    <!--T:6-->
    <!--T:6-->

    Revision as of 10:27, 14 July 2019

      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.


    The KDiff3 Handbook gives a detailed description of activities, in html form.