set git's merge.tool to vimdiff