kdiff3 0.9.92-1ubuntu1 (amd64 binary) in ubuntu gutsy

 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.