From 9d754bd1c474d546c38283483fab61932f6b8895 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Thu, 6 Feb 2025 14:05:28 -0800
Subject: [PATCH] Remove git conflictstyle = zdiff3, not useful that often

---
 gitconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 875c8ec..deff0d5 100644
--- a/gitconfig
+++ b/gitconfig
@@ -36,7 +36,6 @@
 [color]
     ui = auto
 [merge]
-    conflictstyle = zdiff3
     stat = true
 [rebase]
     autosquash = true