From eb48ce27f55d4e020d1ac561abfd85cd35a2c982 Mon Sep 17 00:00:00 2001 From: Baipyrus Date: Fri, 1 Mar 2024 13:42:38 +0100 Subject: [PATCH] install git conflict marker with keymaps --- lua/custom/plugins/conflictmarker.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 lua/custom/plugins/conflictmarker.lua diff --git a/lua/custom/plugins/conflictmarker.lua b/lua/custom/plugins/conflictmarker.lua new file mode 100644 index 0000000..ecb212a --- /dev/null +++ b/lua/custom/plugins/conflictmarker.lua @@ -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' }