vim-conflicted

Easy git merge conflict resolution in Vim


Top Contributors

christoomey calebthompson