johnkingkong / albus-conflictius.nvim

albus-conflictius.nvim

A merge-conflict manager for Neovim with a magic wand that auto-resolves the easy conflicts
2 1 0 1 week ago
git manually-created