From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 26 Jan 2022 17:14:54 +0000 (+0300)
Subject: Let's try to use zdiff3
X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=commitdiff_plain;h=109f0f1e4e4288c2e8d2c880de8f37963526a4b0

Let's try to use zdiff3
---

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]