Mercurial > dotfiles

changeset 715:28900bda2334

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files .chezmoitemplates/init.lua
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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