updated vimdiff settings