.gitconfig: reindent, set merge-tool vimdiff