From 45cd07ed6542fc8cf231c920d7e670d38fe2a997 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Thu, 27 Jun 2024 14:26:05 +0100 Subject: [nvim] Disable conflift line highlighting --- home/.config/nvim/lua/custom/plugins/git.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'home/.config/nvim/lua/custom') 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', -- cgit v1.2.3-70-g09d2