From a8ec15e497ea7519087ff0e4e70437c03a39a90b Mon Sep 17 00:00:00 2001
From: Charles Gould <charles@gould.dev>
Date: Thu, 6 Jul 2023 22:01:29 -0400
Subject: [PATCH] git: revert merge conflict style

---
 git/config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/git/config b/git/config
index 3497ed8..d1121c4 100644
--- a/git/config
+++ b/git/config
@@ -40,8 +40,6 @@
 	diffFilter = delta --color-only
 [log]
 	date = human
-[merge]
-	conflictStyle = zdiff3
 [pull]
 	rebase = true
 [push]