mirror of
https://github.com/Baipyrus/nvim-config.git
synced 2024-11-13 20:43:49 +00:00
install git conflict marker with keymaps
This commit is contained in:
parent
ca7c6260fc
commit
eb48ce27f5
15
lua/custom/plugins/conflictmarker.lua
Normal file
15
lua/custom/plugins/conflictmarker.lua
Normal file
@ -0,0 +1,15 @@
|
||||
-- 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' }
|
Loading…
Reference in New Issue
Block a user