VimTrick: Resolving Merge Conflicts in Vim
If you’re using source control like Git, SVN, or Mercurial then you’re probably accustomed to resolvi...
Tags: vim