sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvim: colors: yolokai: Add highlighting for conflict-markers

Browse source
This commit is contained in:
Sanchayan Maity 2020-12-18 13:56:14 +05:30
parent 8b8b7ec139
commit cf88659f30
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nvim/.config/nvim/colors/yolokai.vim
View file

@ -612,6 +612,13 @@ local highlight_groups = {
WhichKeyGroup = 'Keyword' ,
WhichKeyDesc = {bg=black, fg=orange, style=NONE },
WhichKeyFloating = 'Pmenu' ,
--[[ 4.4.12 conflict-marker ]]
ConflictMarkerBegin = {bg=black, fg=purple, style=NONE },
ConflictMarkerEnd = {bg=black, fg=purple, style=NONE },
ConflictMarkerOurs = {bg=black, fg=green, style=NONE },
ConflictMarkerTheirs = {bg=black, fg=red, style=NONE },
ConflictMarkerCommonAncestorsHunk = {bg=black, fg=orange, style=NONE },
}
-- We do not care about terminals which do not support 256 colors