feat: disable diagnostics with git conflict in file

ecosse3 · Jan 1, 2023 · 2a28a97 · 2a28a97
1 parent 24e9070
commit 2a28a97
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lua/plugins/git/conflict.lua b/lua/plugins/git/conflict.lua
@@ -5,7 +5,7 @@ end
 
 conflict.setup({
   default_mappings = true,     -- disable buffer local mapping created by this plugin
-  disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
+  disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
     highlights = {             -- They must have background color, otherwise the default color will be used
     incoming = 'DiffText',
     current = 'DiffAdd',