diff options
Diffstat (limited to 'lua/ben/plugins/fugitive.lua')
| -rw-r--r-- | lua/ben/plugins/fugitive.lua | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lua/ben/plugins/fugitive.lua b/lua/ben/plugins/fugitive.lua index 4b73c42..051a983 100644 --- a/lua/ben/plugins/fugitive.lua +++ b/lua/ben/plugins/fugitive.lua @@ -17,20 +17,20 @@ return { }, config = function() -- Use > and < to fix merge conflicts (keep the cursor in the middle of the screen) - vim.api.nvim_set_keymap("n", ">", "<cmd>diffg //2<cr><cmd>diffupdate<cr>", { noremap = true, silent = true }) - vim.api.nvim_set_keymap("n", "<", "<cmd>diffg //3<cr><cmd>diffupdate<cr>", { noremap = true, silent = true }) + -- vim.api.nvim_set_keymap("n", ">", "<cmd>diffg //2<cr><cmd>diffupdate<cr>", { noremap = true, silent = true }) + -- vim.api.nvim_set_keymap("n", "<", "<cmd>diffg //3<cr><cmd>diffupdate<cr>", { noremap = true, silent = true }) -- Use } and { to force the entire file - vim.api.nvim_set_keymap( - "n", - "}", - "<C-w>h<cmd>Gwrite!<cr><cmd>diffupdate<cr>", - { noremap = true, silent = true } - ) - vim.api.nvim_set_keymap( - "n", - "{", - "<C-w>l<cmd>Gwrite!<cr><cmd>diffupdate<cr>", - { noremap = true, silent = true } - ) + -- vim.api.nvim_set_keymap( + -- "n", + -- "}", + -- "<C-w>h<cmd>Gwrite!<cr><cmd>diffupdate<cr>", + -- { noremap = true, silent = true } + -- ) + -- vim.api.nvim_set_keymap( + -- "n", + -- "{", + -- "<C-w>l<cmd>Gwrite!<cr><cmd>diffupdate<cr>", + -- { noremap = true, silent = true } + -- ) end, } |