Added conflict highlighting in nvim

1 files changed, 17 insertions, 0 deletions

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' },
+}