audit: print oclock after differences and on one line
audit: print oclock after differences and on one line

Summary: The old output format is ugly when there are conflicts. Clean that up.

Reviewed By: fanzeyi

Differential Revision: D28904554

fbshipit-source-id: 4344f206b687a82fe6a44d2a9fe17d63f5116146

facebook/watchman,facebook/watchman,nodakai/watchman,facebook/watchman,nodakai/watchman,nodakai/watchman,nodakai/watchman,facebook/watchman,nodakai/watchman,nodakai/watchman,facebook/watchman,nodakai/watchman,nodakai/watchman,nodakai/watchman,facebook/watchman,facebook/watchman,facebook/watchman,facebook/watchman