TungstnBallon / conflict.nvim

conflict.nvim

Highlight, navigate and resolve conflict markers
3 1 0 3 weeks ago
editing-support manually-created