KDiff3 icon

KDiff3 For Mac

2.3/5 15
Certified 100% CLEAN GPL   

A useful tool that enables you to compare and merge files/directories. #Compare files  #Merge files  #Automatic merge  #Compare  #Merge  #Comparison  

Description

features

changelog

Free Download

KDiff3 is a program that compares or merges two or three text input files or directories.

The development of KDiff3 started because the developer had to do a difficult merge. Merging is necessary when several people work on the same files in a project. A merge can be somewhat automated, when the merge-tool not only has the new modified files (called "branches"), but also the original file (called "base"). The merge tool will automatically choose any modification that was only done in one branch. When several contributors change the same lines, then the merge tool detects a conflict which must be solved manually.

The merge then was difficult because one contributor had changed many things and corrected the indentation in many places. Another contributor also had changed much text in the same file, which resulted in several merge conflicts.

The tool I used then, only showed the changed lines, but not what had changed within these lines. And there was no information about where only the indentation was changed. The merge was a little nightmare.

So this was the start. The first version could show differences within a line and showed white space differences. Later many other features were added to increase the usefulness.

For example if you want to compare some text quickly, then you can copy it to the clipboard and paste it into either diff window.

A feature that required a big effort was the directory comparison and merge facility, which turned the program almost into a full file browser,

Download Hubs

KDiff3 is part of these download collections: Compare Text

What's new in KDiff3 0.9.98:

  • Text rendering now with QTextLayout fixes the following issues
  • Correct handling for variable width fonts.
  • Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.
  • Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).
Read the full changelog
User Comments
This enables Disqus, Inc. to process some of your data. Disqus privacy policy

KDiff3 0.9.98

add to watchlist add to download basket send us an update REPORT
  runs on:
Mac OS X 10.3 or later (PPC & Intel)
  file size:
10.3 MB
  3 screenshots:
KDiff3 - screenshot #1KDiff3 - screenshot #2KDiff3 - screenshot #3
  main category:
System Utilities
  developer:
  visit homepage