Baipyrus/nvim-config
1
0
Fork 0
mirror of https://github.com/Baipyrus/nvim-config.git synced 2024-11-12 20:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

install git conflict marker with keymaps

Browse Source
This commit is contained in:
Baipyrus 2024-03-01 13:42:38 +01:00
parent ca7c6260fc
commit eb48ce27f5
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lua/custom/plugins/conflictmarker.lua Normal file
View 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' }