Set merge.tool to vimdiff.