--- a/.chezmoitemplates/init.lua	Wed Dec 29 22:03:47 2021 +0100
+++ b/.chezmoitemplates/init.lua	Fri Dec 31 12:18:50 2021 +0100
@@ -66,6 +66,7 @@
   use { 'vim-scripts/gitignore' }
   use {
     'sjl/splice.vim',
+    disable = true,
     opt = true,
     cmd = { 'SpliceInit' },
     config = function()
@@ -78,6 +79,14 @@
       vim.g.splice_wrap = 'nowrap'
     end,
   }
+  use {
+    'zegervdv/merge.nvim',
+    opt = true,
+    cmd = { 'MergeInit' },
+    config = function()
+      require('merge').setup { wrap = true }
+    end,
+  }
   use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } }
 
   -- Comments