home-manager/profiles/nvim/lua/plugins/git-conflict.lua

   1 -- A plugin to visualise and resolve merge conflicts in neovim.
   2 -- https://github.com/akinsho/git-conflict.nvim
   3 return {
   4         "git-conflict.nvim",
   5         event = { "BufEnter" },
   6         after = function()
   7                 require("git-conflict").setup({
   8                         default_mappings = true, -- disable buffer local mapping created by this plugin
   9                         default_commands = true, -- disable commands created by this plugin
  10                         disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
  11                         list_opener = "copen", -- command or function to open the conflicts list
  12                         highlights = { -- They must have background color, otherwise the default color will be used
  13                                 incoming = "DiffAdd",
  14                                 current = "DiffText",
  15                         },
  16                 })
  17         end,
  18 }