From 4402ee46870d05e9ffd801c61bcc4303c9295b11 Mon Sep 17 00:00:00 2001
From: Adrien Waksberg <git@yae.im>
Date: Wed, 13 Sep 2023 11:16:28 +0200
Subject: [PATCH] feat: add git conflict config

---
 configs/git-conflict.lua | 12 ++++++++++++
 plugins.lua              |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 configs/git-conflict.lua

diff --git a/configs/git-conflict.lua b/configs/git-conflict.lua
new file mode 100644
index 0000000..16401d1
--- /dev/null
+++ b/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,
+  }
+})
diff --git a/plugins.lua b/plugins.lua
index d240292..ee385e6 100644
--- a/plugins.lua
+++ b/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",