# HG changeset patch # User zegervdv # Date 1670062793 -3600 # Node ID 28900bda2334fd2b8492b6fde0bed2e95200a209 # Parent 587765960227991cba54b17d851f8efd2c3f2fa2 feat: enable 4 way diff in diffview diff -r 587765960227 -r 28900bda2334 .chezmoitemplates/init.lua --- a/.chezmoitemplates/init.lua Wed Nov 30 18:11:07 2022 +0100 +++ b/.chezmoitemplates/init.lua Sat Dec 03 11:19:53 2022 +0100 @@ -108,7 +108,16 @@ use { 'tpope/vim-git', ft = { 'gitcommit', 'gitrebase' } } use { local_plugin 'diffview.nvim', - config = function() require('diffview').setup { use_icons = false } end, + config = function() + require('diffview').setup { + use_icons = false, + view = { + merge_tool = { + layout = 'diff4_mixed', + }, + }, + } + end, } -- Comments