22 lines
417 B
Lua
22 lines
417 B
Lua
return {
|
|
-- Git
|
|
{
|
|
"lewis6991/gitsigns.nvim",
|
|
dependencies = "nvim-lua/plenary.nvim",
|
|
event = "VimEnter",
|
|
config = function()
|
|
require("gitsigns").setup()
|
|
-- also show signs in scrollbar
|
|
require("scrollbar.handlers.gitsigns").setup()
|
|
end,
|
|
},
|
|
{
|
|
"akinsho/git-conflict.nvim",
|
|
version = "*",
|
|
config = function()
|
|
require("git-conflict").setup()
|
|
end,
|
|
},
|
|
{ "rhysd/conflict-marker.vim" },
|
|
}
|