A powerful command-line front end to diff: manually merge two versions into one.
