From 109f0f1e4e4288c2e8d2c880de8f37963526a4b0 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 26 Jan 2022 20:14:54 +0300
Subject: [PATCH] Let's try to use zdiff3

---
 git/.gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796f..f947858 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,6 +37,7 @@
 	lineNumber = true
 [merge]
 	tool = vimdiff
+	conflictStyle = zdiff3
 [pull]
 	ff = only
 [help]
-- 
2.44.0