git-conflict.nvim

A plugin to visualise and resolve merge conflicts in neovim

939 stars

2 watching

34 forks

Language: Lua

last commit: 18 days ago

Linked from 1 awesome list

Backlinks from these awesome lists:

rockerboo/awesome-neovim