A Neovim plugin for resolving merge conflicts with semantic highlighting, navigation commands, and diff viewing.
A Neovim plugin for resolving merge conflicts with conflict marker highlighting and resolution commands.
Open-Awesome is built by the community, for the community. Submit a project, suggest an awesome list, or help improve the catalog on GitHub.