christoomey / vim-conflicted

Easy git merge conflict resolution in Vim
270Updated 4 years ago

Related projects

Alternatives and complementary repositories for vim-conflicted