From d94ee53c12af6f487d180f2405fdb80b4ee2b14e Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Mon, 18 Mar 2024 17:03:47 -0700
Subject: [PATCH] git: Use zdiff3 conflict markers

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

diff --git a/git/config b/git/config
index 25baf00..8d61f56 100644
--- a/git/config
+++ b/git/config
@@ -36,7 +36,7 @@ defaultBranch = main
 date = iso
 
 [merge]
-conflictStyle = diff3
+conflictStyle = zdiff3
 ff = only
 tool = nvimdiff