Mercurial > dotfiles

changeset 517:0ed17680bf08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use callback hook to disable dirvish maps when merging
author zegervdv <zegervdv@me.com>
date Fri, 31 Dec 2021 12:47:12 +0100
parents cf71ce0b06d3
children 784b931c51b7
files .chezmoitemplates/init.lua
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.chezmoitemplates/init.lua	Fri Dec 31 12:18:50 2021 +0100
+++ b/.chezmoitemplates/init.lua	Fri Dec 31 12:47:12 2021 +0100
@@ -84,7 +84,13 @@
     opt = true,
     cmd = { 'MergeInit' },
     config = function()
-      require('merge').setup { wrap = true }
+      require('merge').setup {
+        wrap = true,
+        pre_hook = function()
+          -- disable dirvish
+          vim.api.nvim_del_keymap('n', '-')
+        end,
+      }
     end,
   }
   use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } }