1 files changed, 3 insertions, 0 deletions

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