spacedentist/resolve.nvim

A Neovim plugin for resolving merge conflicts with conflict marker highlighting and resolution commands.

语言：Lua · GitHub 星标：66 · Fork：6

在 GitHub 上查看原仓库