xxdiff 1:3.1-5 (sparc binary) in ubuntu edgy

 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:
    * Comparing two files, three files, or two directories (shallow
      and recursive);
    * Horizontal diffs highlighting;
    * Files can be merged interactively and resulting output visualized
      and saved;
    * Has features to assist in performing merge reviews/policing;
    * Can unmerge CVS conflicts in automatically merged file and display
      them as two files, to help resolve conflicts;
    * Fully customizable with a resource file;
    * Look-and-feel similar to Rudy Wortel's/SGI xdiff, it is desktop
      agnostic (i.e. will work equally well with KDE or Gnome).