powerful command-line front end to diff
