From c6fcdfef49a6a845eab47c78bef0e73a36da1c9f Mon Sep 17 00:00:00 2001
From: rootiest <chris@rootiest.com>
Date: Sat, 15 Feb 2025 21:28:14 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Feat(diffview):=20use=203-way=20mix?=
 =?UTF-8?q?ed=20windows=20mergeview=20by=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moved diffview opts to main types file and changed default from 3-way veritcal to 3-way mixed
window.
---
 lua/data/types.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lua/data/types.lua b/lua/data/types.lua
index 7ac3c2b..f9a9834 100644
--- a/lua/data/types.lua
+++ b/lua/data/types.lua
@@ -586,6 +586,17 @@ M.tokyonight = {
 --- Autosave configuration options
 M.autosave = {}
 
+--- DiffView configuration options
+M.diffview = {
+  opts = {
+    view = {
+      merge_tool = {
+        layout = 'diff3_mixed',
+      },
+    },
+  },
+}
+
 --- Kulala plugin types
 M.kulala = {
   ft = { 'http', 'https', 'ftp', 'ftps' },