In part from maintainer Dan Weeks <danimal@danimal.org>.
graphical file comparator and merge tool Submitted by: Dan Weeks <danimal@danimal.org>