|
@@ -34,7 +34,7 @@ vim.keymap.set('n', ']q', '<cmd>cnext<CR>', opts)
|
|
|
|
|
|
-- conflicts navigation
|
|
|
vim.keymap.set('n', '[x', '?^[<lt>=>]\\{7}<CR>', opts)
|
|
|
-vim.keymap.set('n', '[x', '/^[<lt>=>]\\{7}<CR>', opts)
|
|
|
+vim.keymap.set('n', ']x', '/^[<lt>=>]\\{7}<CR>', opts)
|
|
|
|
|
|
-- hunk navigation
|
|
|
vim.keymap.set('n', '[c', '<cmd>Gitsigns prev_hunk<CR>', opts)
|