RFS(2): kdiff3 - compares and merges 2 or 3 files or directories
I'm still looking for someone to test and upload the following package.
Package name : kdiff3
Version : 0.9.71
URL : http://kdiff3.sourceforge.net
License : GPL
Description: 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.
The package lintian and linda clean. It can be found at: