2012-04-24

git - use vim with fugitive to resolve merge conflicts

To use fugitive as you mergetool you can use the following.

    git config --global mergetool.fugitive.cmd 'vim -f -c "Gdiff" "$MERGED"'
    git config --global merge.tool fugitive

stackoverflow fugitive screencast

profile for Boris Serebrov on Stack Exchange, a network of free, community-driven Q&A sites