akinsho / git-conflict.nvim

git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim
1366 224 0 6 days ago
git awesome-neovim