From e14ad3ddcc5b040406d3bcc08f01fff4dbe72047 Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Thu, 20 Feb 2025 00:37:37 +0000 Subject: [PATCH] Change merge tools view to one window in diffview --- nvim/lua/plugs/neogit.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nvim/lua/plugs/neogit.lua b/nvim/lua/plugs/neogit.lua index 04595f1..8707296 100644 --- a/nvim/lua/plugs/neogit.lua +++ b/nvim/lua/plugs/neogit.lua @@ -1,11 +1,18 @@ return { "NeogitOrg/neogit", dependencies = { - "sindrets/diffview.nvim", + { + "sindrets/diffview.nvim", + opts = { + view = { + merge_tool = { + layout = "diff1_plain", + }, + }, + }, + } }, event = "VeryLazy", lazy = true, - config = function() - require("neogit").setup() - end + opts = {}, }