feat: add git conflict config

configs/git-conflict.lua

@@ -0,0 +1,12 @@
+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,
+  }
+})

plugins.lua

@@ -15,7 +15,9 @@ local plugins = {
   {
     "akinsho/git-conflict.nvim",
     lazy = false,
-    config = true,
+    config = function()
+      require "custom.configs.git-conflict"
+    end,
   },
   {
     "vinnymeller/swagger-preview.nvim",