17 lines
352 B
Lua
17 lines
352 B
Lua
return {
|
|
-- Git
|
|
{
|
|
'lewis6991/gitsigns.nvim',
|
|
dependencies = 'nvim-lua/plenary.nvim',
|
|
event = 'User ActuallyEditing',
|
|
},
|
|
{
|
|
'akinsho/git-conflict.nvim',
|
|
version = '*',
|
|
config = function()
|
|
require('git-conflict').setup()
|
|
end,
|
|
},
|
|
{ 'rhysd/conflict-marker.vim' }
|
|
}
|