seliaste/nvim-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add git conflict git signs

Browse source
This commit is contained in:
Neeraj 2023-05-22 21:01:11 +05:30
parent a69141cce0
commit ea941b5aa6
3 changed files with 72 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
after/plugin/defaults.lua
View file

@ -106,3 +106,9 @@ for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, {text = icon, texthl = hl, numhl = hl})
end
vim.cmd [[highlight ConflictMarkerBegin guibg=#2f7366]]
vim.cmd [[highlight ConflictMarkerOurs guibg=#2e5049]]
vim.cmd [[highlight ConflictMarkerTheirs guibg=#344f69]]
vim.cmd [[highlight ConflictMarkerEnd guibg=#2f628e]]
vim.cmd [[highlight ConflictMarkerCommonAncestorsHunk guibg=#754a81]]