Added git merge tool vimdiff