summaryrefslogtreecommitdiffstats
path: root/freebsd/applications/development/kdiff3/pkg-descr
blob: 844f83140ed900b16c487033dc7fe6d4491e3183 (plain)
1
2
3
4
5
6
7
Compares and merges 2 or 3 files or directories

KDiff3 compares two or three input files and shows the differences
line by line and character by character. It provides an automatic
merge facility and an integrated editor for comfortable solving of
merge conflicts. KDiff3 allows recursive directory comparison and
merging as well.