[var.media_title;onformat=retitle]

KDiff3 是一個比對檔案或資料夾差異並進行合併的工具，它 能夠比對或合併兩個或三個文字輸入檔或資料夾， 能依行或是字元顯示差異， 提供自動合併功能， 提供能夠輕鬆解決合併衝突的編輯器， 透過 KIO 提供「網路透明」， 可以突顯或隱藏空白字元 ...

KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. These are available for Un*x, Windows, Mac. Thus there are many setup possibilities to consider. Supported Qt-versions: 4.8, 5.2 or higher. Supported KDE-version: 4, 5 (For KD

KDiff3 是一款强大的、免费开源的图形化工具，旨在简化这一过程。 它不仅能清晰地展示文件或目录间的不同之处，还提供了强

KDiff3 is a free and open source text comparison app and file organizer developed by Joachim Eibl for Windows. It's efficient, user friendly, easy-to-use, reliable and customizable.

Diff-Ext-for-KDiff3 - shell extension for Windows included in installer (originally by Sergey Zorin: see also Diff Ext) Fix for slow startup problem on Windows (Patch by Manfred Koehler)

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character analysis and a text merge tool with integrated editor. It can also compare and merge directories.

kdiff3是天下最好用的比较和merge工具，支持linux windows和mac。 下文我们将通过例子介绍如何使用kdiff3 来处理git merge时的冲突。