Mercurial > dotfiles

comparison .chezmoitemplates/init.lua @ 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
comparison
equal deleted inserted replaced
515:67a4228c6532 516:cf71ce0b06d3
64 64
65 -- Git/VCS 65 -- Git/VCS
66 use { 'vim-scripts/gitignore' } 66 use { 'vim-scripts/gitignore' }
67 use { 67 use {
68 'sjl/splice.vim', 68 'sjl/splice.vim',
69 disable = true,
69 opt = true, 70 opt = true,
70 cmd = { 'SpliceInit' }, 71 cmd = { 'SpliceInit' },
71 config = function() 72 config = function()
72 vim.g.splice_initial_diff_grid = 1 73 vim.g.splice_initial_diff_grid = 1
73 vim.g.splice_initial_diff_compare = 1 74 vim.g.splice_initial_diff_compare = 1
74 vim.g.splice_initial_diff_path = 0 75 vim.g.splice_initial_diff_path = 0
75 vim.g.splice_initial_scrollbind_grid = 1 76 vim.g.splice_initial_scrollbind_grid = 1
76 vim.g.splice_initial_scrollbind_compare = 1 77 vim.g.splice_initial_scrollbind_compare = 1
77 vim.g.splice_initial_scrollbind_path = 1 78 vim.g.splice_initial_scrollbind_path = 1
78 vim.g.splice_wrap = 'nowrap' 79 vim.g.splice_wrap = 'nowrap'
80 end,
81 }
82 use {
83 'zegervdv/merge.nvim',
84 opt = true,
85 cmd = { 'MergeInit' },
86 config = function()
87 require('merge').setup { wrap = true }
79 end, 88 end,
80 } 89 }
81 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } 90 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } }
82 91
83 -- Comments 92 -- Comments