Added vimdiff settings