From 127705b957339b1d4b70ff33488d5b9b53872316 Mon Sep 17 00:00:00 2001
From: Grégoire Duchêne <gduchene@awhk.org>
Date: Sat, 29 Jan 2022 13:24:54 +0000
Subject: git: Set conflict style to ‘zdiff3’
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git/config | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/config b/git/config
index 861d0b0..afd48eb 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,9 @@
 [init]
   defaultBranch = main
 
+[merge]
+  conflictStyle = zdiff3
+
 [pull]
   ff = only
 
-- 
cgit v1.2.3-70-g09d2