git: use vim with fugitive to resolve merge conflicts
To use fugitive as a merge tool you can run the following commands:
git config --global mergetool.fugitive.cmd 'vim -f -c "Gdiff" "$MERGED"'
git config --global merge.tool fugitive
vim, git, aws and other three-letter words
Software Development Notes