Posts labeled "vimdiff"

Using Vimdiff With Git

Continuing the Vim workflow series I take a shallow dive into using vimdiff with git and the general vimdiff workflow.My toolsgithub.com/shawncplus/dotfiles - My vimrc/dotfiles/plugins that I usegithub.com/shawncplus/skittles_berry - My vim colorscheme. It's awesome. Use it. more »