From 5febea0f8aaf8e68361a6dc7508c1cd805848f23 Mon Sep 17 00:00:00 2001
From: Baipyrus <simon.waltemathe@gmail.com>
Date: Thu, 17 Oct 2024 10:54:36 +0200
Subject: [PATCH] group conflict-marker.vim autocmds in one

---
 lua/custom/plugins/conflictmarker.lua | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lua/custom/plugins/conflictmarker.lua b/lua/custom/plugins/conflictmarker.lua
index d2c68fe..797b02c 100644
--- a/lua/custom/plugins/conflictmarker.lua
+++ b/lua/custom/plugins/conflictmarker.lua
@@ -32,15 +32,10 @@ return {
       end
 
       -- Autocommand to disable diagnostics on buffer enter
-      vim.api.nvim_create_autocmd('BufRead', {
+      vim.api.nvim_create_autocmd({ 'BufRead', 'BufWritePre' }, {
         group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = true }),
         callback = git_conflict_detection,
       })
-      -- Autocommand to disable diagnostics on save
-      vim.api.nvim_create_autocmd('BufWritePre', {
-        group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = false }),
-        callback = git_conflict_detection,
-      })
     end,
   },
 }