akinsho/git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

git awesome-neovim
last synced 8 hours ago
651 95 1