Adds vimdiff to merge tool