From ddc13e5beeb6183654f77c25781c480631b3e041 Mon Sep 17 00:00:00 2001
From: xesc <xesc@xesc.de>
Date: Thu, 27 Feb 2025 19:27:34 +0100
Subject: [PATCH] add better mergetool options

---
 config | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config b/config
index d5adc40..c67be24 100644
--- a/config
+++ b/config
@@ -14,12 +14,15 @@
     prompt = false
 
 [merge]
-    tool = nvimdiff2
+    tool = nvimdiff
 
 [mergetool]
     keepBackup = false
     prompt = false
 
+[mergetool "nvimdiff"]
+    layout = "LOCAL,MERGED,REMOTE + LOCAL,BASE,REMOTE / MERGED + LOCAL, REMOTE + MERGED + BASE, MERGED"
+
 [include]
     path = ~/.config/.gitlocalconfig