From 517d0111aaca6ed93b2a066119bb350ef92e7d88 Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Wed, 10 Sep 2025 21:25:47 +0200
Subject: [PATCH] gitconfig disable diff3

---
 HOME/.gitconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HOME/.gitconfig b/HOME/.gitconfig
index c7766b8..bec2e9a 100644
--- a/HOME/.gitconfig
+++ b/HOME/.gitconfig
@@ -13,8 +13,8 @@
     required = true
 [interactive]
     diffFilter = delta --color-only
-[merge]
-    conflictstyle = diff3
+; [merge]
+;     conflictstyle = diff3
 [delta]
     navigate = true
     light = false