akinsho/git-conflict.nvim

This is stars and forks stats for /akinsho/git-conflict.nvim repository. As of 13 May, 2024 this repository has 622 stars and 21 forks.

git-conflict.nvim git-conflict.mov A plugin to visualise and resolve conflicts in neovim. This plugin was inspired by conflict-marker.vim Status This plugin is under active development, it should generally work, but you're likely to encounter some bugs during usage. Requirements git nvim 0.7+ Installation -- packer.nvim use {'akinsho/git-conflict.nvim', tag = "*", config = function() require('git-conflict').setup() end} -- lazy.nvim {'akinsho/git-conflict.nvim', version...