diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2024-06-27 14:26:05 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2024-06-27 14:26:05 +0100 |
| commit | 45cd07ed6542fc8cf231c920d7e670d38fe2a997 (patch) | |
| tree | 68a03f58cf90dcf308645263f0862c8190bdace6 /home | |
| parent | 731dc15eceb183285848281daedab2138aa4be4c (diff) | |
| download | dotfiles-45cd07ed6542fc8cf231c920d7e670d38fe2a997.tar.gz dotfiles-45cd07ed6542fc8cf231c920d7e670d38fe2a997.tar.bz2 dotfiles-45cd07ed6542fc8cf231c920d7e670d38fe2a997.zip | |
[nvim] Disable conflift line highlighting
Diffstat (limited to 'home')
| -rw-r--r-- | home/.config/nvim/lua/custom/plugins/git.lua | 6 |
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', |