diff: Pre-screening for dir cases; Proper diff formatting