git: Use vimdiff for merge conflicts