From 7d6c4f1fcb2d36a70e7c521aa865fa9dcae6faa5 Mon Sep 17 00:00:00 2001
From: Arti Zirk <arti.zirk@gmail.com>
Date: Thu, 1 Jun 2023 15:22:05 +0300
Subject: [PATCH] Switch git to zdiff3 algo

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 26a47c3..a912814 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,7 +3,7 @@
 	email = arti.zirk@gmail.com
 [merge]
 	tool = meld
-	conflictstyle = diff3
+	conflictStyle = zdiff3
 
 [alias]
 	plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches