mirror of
https://github.com/Baipyrus/nvim-config.git
synced 2024-11-14 13:03:49 +00:00
16 lines
558 B
Lua
16 lines
558 B
Lua
|
-- Disable the default highlight group
|
||
|
|
vim.g.conflict_marker_highlight_group = ''
|
||
|
|
|
||
|
|
-- Include text after begin and end markers
|
||
|
|
vim.g.conflict_marker_begin = '^<<<<<<< .*$'
|
||
|
|
vim.g.conflict_marker_end = '^>>>>>>> .*$'
|
||
|
|
|
||
|
|
-- Highlight groups
|
||
|
|
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'
|
||
|
|
|
||
|
|
return { 'rhysd/conflict-marker.vim' }
|