From c878a7b0be91d3a6204eb76b5d15aa6194809275 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Tue, 3 May 2022 09:26:36 +0530
Subject: [PATCH] git: Use zealous diff3 style of merge conflict presentation

This is only available from git 2.35. A description of how this works is
in the original commit.
https://github.com/git/git/commit/4496526f80b3e4952036550b279eff8d1babd60a
---
 git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 2b6ec18..de3b8aa 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -27,7 +27,7 @@
     cmd = kitty +kitten diff $LOCAL $REMOTE
 [merge]
 	tool = diffconflicts
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 	ff = only
 [mergetool]
 	prompt = false