xxdiff is a graphical browser for viewing the differences between two or three files, or between two directories, and can be used to produce a merged version.
Release Notes: xxdiff was ported to Qt 4.x. As such, It should now also work on Mac OS X.
Release Notes: This release implements a Python package that contains code to support writing scripts around xxdiff. All the xxdiff-* scripts have been integrated in this Python package and renamed for convenience. A warning is now issued in decision making when accepting or rejecting, if incompatible selections have been made. The build system has been converted from tmake to qmake.
Release Notes: This version fixes a crash bug with redo diff.
Release Notes: Changes to render carriage return characters nicely. Saving options now occurs in ~/.xxdiffrc. This release can xxdiff text from FIFOs. An option has been added to enable showing the merged pane on startup.
Release Notes: This version features various bugfixes and enhancements to the accompanying scripts. There is scroll wheel support over the text views. Horizontal insert markers were added.