# .gitconfig file
[mergetool "mvimdiff"]
cmd="mvim -c 'Gdiff' $MERGED" # use fugitive.vim for 3-way merge
keepbackup=false
[merge]
summary = true
verbosity = 1
tool = mvimdiff
conflictstyle = diff3
git config --global merge.tool vimdiff
git config --global merge.conflictstyle diff3
git config --global merge.tool mvimdiff
git config --global merge.conflictstyle diff3
