change merge tool to vimdiff