TungstnBallon / conflict.nvim

conflict.nvim

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