Set zdiff3 as Git merge conflict style

screendriver · screendriver · commit 5788c6aca550 · 2024-11-08T09:05:36.000+01:00
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
@@ -31,3 +31,5 @@
   syntax-theme = Dracula
 [init]
   defaultBranch = main
+[merge]
+  conflictStyle = zdiff3
