A very simple Neovim plugin to help you with manual Git conflict resolution.

Branches

main Default
0a87d014 ·