4259 links
  • Arnaud's links
  • Home
  • RSS Feed
  • Tag cloud
  • Login
search: tag:merge tag:vim — newest first
  • Fugitive.vim - resolving merge conflicts with vimdiff

    :Gdiff
    :dp

    December 9, 2016 - permalink - http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
    fugitive merge vim
  • How to resolve git merge conflicts with Vim - Flaviu Simihaian's Blog - Entrepreneur and Developer

    \o/

    December 9, 2016 - permalink - http://flaviusim.com/blog/how-to-do-a-git-merge-with-vim/
    git merge vim