/vim-conflicted

Easy git merge conflict resolution in Vim

Primary LanguageVim scriptMIT LicenseMIT

Watchers