Fix git-seach conflict markers

2 years ago · 47ccd30a9e
parent 537459c2de
commit 47ccd30a9e
1 changed files with 1 additions and 2 deletions
--- a/nvim/lua/mappings.lua
+++ b/nvim/lua/mappings.lua
@ -93,8 +93,7 @@ map('n', '<leader>l', '<cmd>FloatermNew lazygit<cr>')
 map('n', '<leader>gd', '<cmd>DiffviewOpen<cr>')
 map('n', '<leader>gc', '<cmd>DiffviewClose<cr>')
 map('n', '<leader>gh', '<cmd>DiffviewFileHistory<cr>')
-- TODO rework this?!
-map('n', '<leader>gf', '/\\v^[<\\|=>]{7}( .*\\|$)<cr>')
+map('n', '<leader>gf', "<cmd>execute '/\\v^[<\\|=>]{7}/'<cr>")

 -- floaterm
 map('n', '-', '<cmd>FloatermNew nnn<cr>')