From 974c60c0a8fa10f895a1f16d7fc0539c0cacf2b8 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 12 Oct 2024 22:25:32 +0300
Subject: [PATCH] Set the git conflictstyle.
---
.config/git/config | 1 +
1 file changed, 1 insertion(+)
diff --git a/.config/git/config b/.config/git/config
index b6dcd76..08bc4c3 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -76,6 +76,7 @@
defaultBranch = master
[merge]
+ conflictstyle = zdiff3
ff = false
tool = meld
--
GitLab