diff formatting