14 lines
469 B
Lua
14 lines
469 B
Lua
return {
|
|
"akinsho/git-conflict.nvim",
|
|
config = function()
|
|
require("git-conflict").setup({
|
|
default_mappings = true, -- enable buffer local mapping created by this plugin
|
|
disable_diagnostics = true, -- This will disable diagnostics in a buffer whilst it is conflicted
|
|
highlights = { -- They must have background color, otherwise the default color will be used
|
|
incoming = "DiffText",
|
|
current = "DiffAdd",
|
|
},
|
|
})
|
|
end,
|
|
}
|