merge tool = vimdiff