AXDiff

Short:        Grahpical file compare and merge utility
Author:       lawrie@merlin.dev.cdx.mot.com (Jim Lawrie)
Uploader:     lawrie merlin dev cdx mot com (Jim Lawrie)
Type:         util/misc
Architecture: m68k-amigaos

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.