KDiff3

kdiff3

WARNING: there will be no new versions of this package. diff and 3-way merge i686