Mercurial > dotfiles
comparison .chezmoitemplates/init.lua @ 715:28900bda2334
feat: enable 4 way diff in diffview
author | zegervdv <zegervdv@me.com> |
---|---|
date | Sat, 03 Dec 2022 11:19:53 +0100 |
parents | 587765960227 |
children | 787e0516daa5 |
comparison
equal
deleted
inserted
replaced
714:587765960227 | 715:28900bda2334 |
---|---|
106 end, | 106 end, |
107 } | 107 } |
108 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } | 108 use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } |
109 use { | 109 use { |
110 local_plugin 'diffview.nvim', | 110 local_plugin 'diffview.nvim', |
111 config = function() require('diffview').setup { use_icons = false } end, | 111 config = function() |
112 require('diffview').setup { | |
113 use_icons = false, | |
114 view = { | |
115 merge_tool = { | |
116 layout = 'diff4_mixed', | |
117 }, | |
118 }, | |
119 } | |
120 end, | |
112 } | 121 } |
113 | 122 |
114 -- Comments | 123 -- Comments |
115 use { | 124 use { |
116 'numToStr/Comment.nvim', | 125 'numToStr/Comment.nvim', |