13 lines
256 B
Lua
13 lines
256 B
Lua
|
require("git-conflict").setup({
|
||
|
|
debug = false,
|
||
|
|
default_mappings = false,
|
||
|
|
default_commands = true,
|
||
|
|
disable_diagnostics = false,
|
||
|
|
list_opener = 'copen',
|
||
|
|
highlights = {
|
||
|
|
current = 'DiffText',
|
||
|
|
incoming = 'DiffAdd',
|
||
|
|
ancestor = nil,
|
||
|
|
}
|
||
|
|
})
|