akinsho/git-conflict.nvim

A plugin to visualise and resolve merge conflicts.