A Neovim plugin for resolving merge conflicts with conflict marker highlighting and resolution commands.
Repository Index
64,265 visible repositories in the index
1–1 of 1 · Most stars
64,265 visible repositories in the index
1–1 of 1 · Most stars
A Neovim plugin for resolving merge conflicts with conflict marker highlighting and resolution commands.