How to resolve git merge conflicts with Vim - Flaviu Simihaian's Blog - Entrepreneur and Developer
December 9, 2016 at 9:54:02 AM GMT+1 - permalink - - http://flaviusim.com/blog/how-to-do-a-git-merge-with-vim/