KDiff3 is a program that compares or merges two or three text input files or directories.
Features:
- 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"
- supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
- Printing of differences,
- Manual alignment of lines,
- Automatic merging of version control history ($Log$),
- an intuitive graphical user interface.
Requirements:
· g++ 3.2
· Qt 3.1.0
What's New in This Release: [ read full changelog ]
· Fix for hidden text windows with --auto-flag.
· Fix for pasting clipboard truncated text if it contained characters that needed more than one byte in UTF-8 encoding.
· Fix for horizontal scrolling if word wrap is enabled.
· Directory tree: files hidden due to options (e.g. patterns etc.) don't affect folder equality any more.
· KDE: KIO-progress dialog is now hidden. (KDiff3 has its own progress dialog.)
· Directory merge: Default op for change in either B or C and delete in the other is now merge (previously copy).
· Directory merge: Not preserving merge operation after reload, because it might have changed.
Find us on Google+
