KDiff3

Version:

0.9.97

Release date:

Saturday, 23 October, 2010

Home:

http://kdiff3.sourceforge.net/

Categories:

Utilities: file management

License:

GPL

Interface:

PMShell
Workplace Shell

Italiano

Authors/Port authors:

Netlabs, Silvan Scherrer (diver)

KDiff3 is a 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",
printing of differences,
manual alignment of lines,
automatic merging of version control history ($Log$),
an intuitive graphical user interface,
NLS support

This software is distributed as compressed package. You have to download and manually install it; if prerequisites are required, you will have to manually install them too.

Manual installation

Program is distributed as ZIP package: download to temporary directory and unpack to destination folder. See below for download link(s).

Following is a list of prerequisites that you have to manually install in order to have the program working:

You can install the prerequisites with rpm running the following string in a command line:

yum install libc libcx libgcc1 libssp libstdc++6 libstdc++ libsupc++6 libsupc++ libgcc-fwd libqt4 libqt4-gui libqt4-webkit libqt4-sql-mysql libqt4-sql-psql cups

Following ones are the download links for manual installation:

KDiff3 v. 0.9.97 (23/10/2012)	Readme/What's new	Version 0.9.97 - 2012-08-10 =========================== - Memory usage optimized for comparison of large directories. (ca. 1/5 needed) - On Windows use config file .kdiff3rc next to kdiff3.exe if exists. - In overwiev for two way diff show if only one side contains text. - Fix for Fedora by Neal Becker in src-QT4/kdiff3part.desktop. - When word wrap is active toggling line numbers now recalculates the word wrap. - Removed confusing "For compatibility ..." hint from option -qall - Fixed mouse wheel problem. (Patch by David Hay) - Change an encoding in diff text window via click on encoding label. (Patch by Alexey Kostromin) - Fix for tab-key moving focus instead of adding a tab character in MergeResultWindow. - Workaround for git on Cygwin that allows KDiff3 to find files in a Cygwin "/tmp" directory when environment variable "CYGWIN_BIN" is set. (Patch by Nigel Stewart) - Removed iostream dependency (Patch by Nigel Stewart) - Regression test framework (by Maurice van der Pot) - Documentation patch (by Burkard Lueck) - Select text in Find dialog (by Eike Sauer) - If text is selected in either input or output window use that in Find dialog. - Added default directory anti patterns ".hg" and ".git" and file anti patterns ".rej" and ".bak" for better mercurial and git integration. - Command line option --cs doesn't change the config value permanently anymore. - On KDE: Not creating a KDiff3Part anymore. - Windows (Vista or Win 7): Shell context menu in directory comparison view now again displays text. - Windows 64 bit: Diff-Ext-for-KDiff3 context menu now installed as 32 bit and 64 bit versions to allow other 32 bit programs to use it too. - Windows 64 bit specific installer.
ftp.netlabs.org/pub/qtapps/kdiff3-0.9.97.zip
KDiff3 v. 0.9.96 (27/9/2011)	Readme/What's new	Version 0.9.96 - 2011-09-02 =========================== - KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4.6) - Parser for preprocessor commands. (Allows single apostrophs ') - On Windows if the preprocessor command is "sed" try to use a "bin\sed.exe" next to the kdiff3.exe, if available. - Warn if conversion errors appear (Invalid characters) - Fix crash on A/B-overview (infinite recursion) - Fix clearcase temp files not deleted problem on windows - KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore - String corrections (Frederik Schwarzer) - Fixed writing to KIO. - OS2-Port (Patch by Silvan Scherrer) - Fixed problem where destination directory would be renamed or deleted during copy operation. Now if the destination directory exists only the files inside will be copied. - In merge: Separate lines where the automatic choice would be the same but for different reasons. - Fixed some problems with huge files in directory comparison mode (>2GB) (but direct comparison is still not possible) - Fixed documentation compile errors with KDE>=4.5 - Fixed white space merge default options - Fixed regexp test tool. - Exclude printing code if Qt was compiled without printing support. - For Windows: Fixed handling of unicode characters in command line parameters. - Improved "old mac" lineendstyle handling: Break lines. - Detect encoding specified in xml header or html "meta" tag.
ftp.netlabs.org/pub/qtapps/kdiff3-0.9.96.zip