From 1717641ed2840cf9b349abeeac7fd91eb5b833ed Mon Sep 17 00:00:00 2001
From: Kyren223 <kyren223@proton.me>
Date: Wed, 30 Jul 2025 18:27:42 +0300
Subject: Added conflict highlighting in nvim

---
 .config/nvim/lua/plugins/conflict-marker.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .config/nvim/lua/plugins/conflict-marker.lua

(limited to '.config/nvim/lua/plugins/conflict-marker.lua')

diff --git a/.config/nvim/lua/plugins/conflict-marker.lua b/.config/nvim/lua/plugins/conflict-marker.lua
new file mode 100644
index 0000000..c85f472
--- /dev/null
+++ b/.config/nvim/lua/plugins/conflict-marker.lua
@@ -0,0 +1,17 @@
+return {
+    'tronikelis/conflict-marker.nvim',
+    opts = {
+        on_attach = function(conflict)
+            local MID = '^=======$'
+
+            vim.keymap.set('n', '<leader>M', function()
+                vim.cmd('?' .. MID)
+            end, { buffer = conflict.bufnr })
+
+            vim.keymap.set('n', '<leader>m', function()
+                vim.cmd('/' .. MID)
+            end, { buffer = conflict.bufnr })
+        end,
+    },
+    event = { 'BufReadPre', 'BufNewFile' },
+}
-- 
cgit v1.3.1