Graft of 'cli_diff_command' into 'master'.