xxdiff: xxdiff (graphical file and directories comparator and merge tool)
xxdiff:
xxdiff: This program is an essential software development tool that can
xxdiff: be used to:
xxdiff: * visualize the differences between files or directories
xxdiff: * merge files with differences, resolving conflicts and saving
xxdiff:   output to a new file or patch
xxdiff: * assist file changes reviewing and comment production
xxdiff:   (e.g. approving source code changes before they get merged
xxdiff:   into a source tree).
xxdiff: homepage: http://furius.ca/xxdiff/