akinsho / git-conflict.nvim

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1353 220 0 1 week ago
git awesome-neovim