The Debian package of Martin Blais' powerful visual diff and
merge tool
xxdiff
can be found
here.
xxpatch is a little tool that let's you
apply patches without altering your original sources and let's
you see and merge the result inside xxdiff.
Enjoy!
Tomas Pospisek
