xxdiff 1:3.2-5 (hppa binary) in ubuntu hardy

 A powerful tool for viewing the differences between two or three files,
 or two directories, and can be used to produce a merged version. The
 texts of the two or three files are presented side by side with their
 differences highlighted with colors for easy identification. Among its
 features are:
 .
  * can compare two files, three files, or two directories (shallow and
    recursive);
  * horizontal diffs highlighting;
  * files can be merged interactively and resulting output visualized and
    saved;
  * can unmerge CVS conflicts in automatically merged files and display
    themi as two files, to help resolve conflicts;
  * fully customizable with a resource file;
 .
 The scripts that accompany xxdiff can be found in the xxdiff-tools
 package.
 .
 Homepage: http://furius.ca/xxdiff/