# HG changeset patch
# User zegervdv <zegervdv@me.com>
# Date 1640951232 -3600
# Node ID 0ed17680bf08d85cc9092ada058bcdcb62147f58
# Parent  cf71ce0b06d34e080df47c183eea60e5aaa528ca
Use callback hook to disable dirvish maps when merging

diff -r cf71ce0b06d3 -r 0ed17680bf08 .chezmoitemplates/init.lua
--- 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' } }