From 934a07640e8691394e9ecedc1afcbc49c51b3d25 Mon Sep 17 00:00:00 2001
From: electria <elec3137+git@proton.me>
Date: Fri, 26 Jun 2026 07:39:25 -0700
Subject: [PATCH] git: unset conflictStyle

diff3 adds a lot of lines to do the conflict,
which can make it harder to understand in full sometimes.

especially when the lsp is just filling it with errors
---
 defaults/git.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/git.nix b/defaults/git.nix
index 564517a..94d5861 100644
--- a/defaults/git.nix
+++ b/defaults/git.nix
@@ -30,7 +30,6 @@ in
 
         push.autoSetupRemote = true;
 
-        merge.conflictStyle = "zdiff3"; # easiest to understand style
         commit.verbose = true; # show diffs in commit editor
       };
     };