lua << EOF require('git-conflict').setup({ default_mappings = true, -- disable buffer local mapping created by this plugin default_commands = true, -- disable commands created by this plugin disable_diagnostics = false, -- This will disable the 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', } }) vim.keymap.set('n', 'co', '(git-conflict-ours)') vim.keymap.set('n', 'ct', '(git-conflict-theirs)') vim.keymap.set('n', 'cb', '(git-conflict-both)') vim.keymap.set('n', 'c0', '(git-conflict-none)') vim.keymap.set('n', ']x', '(git-conflict-prev-conflict)') vim.keymap.set('n', '[x', '(git-conflict-next-conflict)') EOF