From 4619c677abaa91d0041b183c3f4fb3ffdbf8956f Mon Sep 17 00:00:00 2001
From: Jordan Atwood <nightfirecat@nightfirec.at>
Date: Mon, 15 Jan 2024 19:45:54 -0800
Subject: [PATCH] Change git config diff mode to zdiff3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Debian stable supports this feature now. 🎉
---
 src/.gitconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/.gitconfig b/src/.gitconfig
index 2620f9e..071fbf8 100644
--- a/src/.gitconfig
+++ b/src/.gitconfig
@@ -74,9 +74,7 @@
 [log]
 	follow = true
 [merge]
-	# TODO: Switch this to the even better "zdiff3" (zealous diff3) setting once
-	# git 2.35 is available in Debian stable
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 [notes]
 	displayRef = refs/notes/*
 [pager]