Mercurial > dotfiles

changeset 516:cf71ce0b06d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable merge.nvim
author zegervdv <zegervdv@me.com>
date Fri, 31 Dec 2021 12:18:50 +0100
parents 67a4228c6532
children 0ed17680bf08
files .chezmoitemplates/init.lua dot_gitconfig.tmpl
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/dot_gitconfig.tmpl	Wed Dec 29 22:03:47 2021 +0100
+++ b/dot_gitconfig.tmpl	Fri Dec 31 12:18:50 2021 +0100
@@ -17,7 +17,7 @@
 [merge]
 	tool = splice
 [mergetool "splice"]
-	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	cmd = "nvim -f $BASE $LOCAL $REMOTE $MERGED -c 'MergeInit'"
 	trustExitCode = true
 [alias]
 	ls = log --format=\"%C(auto)%h %<(15)%C(auto, green)%cr %>(20)%C(auto, magenta)%an %C(auto)%s %D\"