AXDiff will compare two files, side by side, and show you the
differences between them in graphical format.  It will allow you to
merge common lines as well as each difference independently to a
merged file.  All, either, or both file's difference may be merged.
Fonts and other options configureable.

 PERMSSN    UID  GID    PACKED    SIZE  RATIO     CRC       STAMP          NAME
---------- ----------- ------- ------- ------ ---------- ------------ -------------
[generic]                23083   47268  48.8% -lh5- b7b1 Sep 15  1994 AXDiff
[generic]                 4876   13262  36.8% -lh5- 7c56 Sep 17  1994 AXDiff.doc
[generic]                  183     465  39.4% -lh5- 58f2 Sep 17  1994 AXDiff.doc.info
[generic]                  307    1320  23.3% -lh5- 8e10 Sep 17  1994 AXDiff.info
[generic]                  117     256  45.7% -lh5- 4c1a Sep 17  1994 RegForm
[generic]                  177     465  38.1% -lh5- f40c Sep 17  1994 RegForm.info
[generic]                  290     567  51.1% -lh5- 7594 Sep 17  1994 readme
---------- ----------- ------- ------- ------ ---------- ------------ -------------
 Total         7 files   29033   63603  45.6%            Sep 17  1994