command-line options and overloaded diff and tree options finalized