aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/home/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'home/.config/nvim')
-rw-r--r--home/.config/nvim/lua/custom/plugins/git.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/home/.config/nvim/lua/custom/plugins/git.lua b/home/.config/nvim/lua/custom/plugins/git.lua
index ea02550..e161029 100644
--- a/home/.config/nvim/lua/custom/plugins/git.lua
+++ b/home/.config/nvim/lua/custom/plugins/git.lua
@@ -4,6 +4,12 @@ return {
{
'akinsho/git-conflict.nvim',
opts = {
+ disable_diagnostics = true,
+ highlights = {
+ current = nil,
+ incoming = nil,
+ ancestor = nil,
+ },
default_mappings = {
next = ']x',
prev = '[x',