add merge.tool vimdiff