git - use vim with fugitive to resolve merge conflicts
To use fugitive as a mergetool you can run the following commands:
git config --global mergetool.fugitive.cmd 'vim -f -c "Gdiff" "$MERGED"'
git config --global merge.tool fugitive
Links
stackoverflow fugitive screencast
close