moved inherited definitions from magit to diff

I've moved some face definitions from magit to diff. Magit inherits them by default, so you shouldn't see any difference.