|
@@ -1,6 +1,15 @@
|
|
|
+local diffview = require('diffview')
|
|
|
local MiniDiff = require('mini.diff')
|
|
|
local util = require('user.util')
|
|
|
|
|
|
+diffview.setup({
|
|
|
+ use_icons = false,
|
|
|
+ signs = {
|
|
|
+ fold_closed = ' ',
|
|
|
+ fold_open = '-',
|
|
|
+ }
|
|
|
+})
|
|
|
+
|
|
|
-- shows added/removed/changed lines
|
|
|
MiniDiff.setup({
|
|
|
-- keymap #bracketed
|
|
@@ -35,6 +44,8 @@ MiniDiff.setup({
|
|
|
vim.keymap.set('n', '<Leader>gs', '<cmd>Gedit :<CR>')
|
|
|
vim.keymap.set('n', '<Leader>gb', '<cmd>Telescope git_branches<CR>')
|
|
|
vim.keymap.set('n', '<Leader>gd', MiniDiff.toggle_overlay)
|
|
|
+vim.keymap.set('n', '<Leader>gvi', '<cmd>DiffviewOpen<CR>')
|
|
|
+vim.keymap.set('n', '<Leader>gvr', '<cmd>DiffviewFileHistory --range=origin..HEAD<CR>')
|
|
|
|
|
|
-- conflicts navigation #bracketed
|
|
|
vim.keymap.set('n', '[x', '?^[<lt>=>]\\{7}<CR>')
|