From 1b3cb98eee66d01f7d60f81d0d7f94a6cd99b356 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 31 Mar 2025 14:09:59 -0400
Subject: [PATCH] use diff format available on older gits

---
 dot_config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_config/git/config b/dot_config/git/config
index c8ce0bb..409ef60 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -14,7 +14,7 @@
   minRacyThreshold = 6379 microseconds
 [merge]
   tool = meld
-  conflictstyle = zdiff3
+  conflictstyle = diff3
 [review "review.lineageos.org"]
   username = jbeckmeyer
 [filter "lfs"]