From f81012d8b8fa09a110064a57faaa3f2404c49129 Mon Sep 17 00:00:00 2001
From: Andrew Lee <candrewlee14@gmail.com>
Date: Fri, 13 Jun 2025 18:13:43 -0600
Subject: [PATCH] use side-by-side for delta diff output

---
 dot_gitconfig.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 0c6ae2a..e392156 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -18,13 +18,14 @@
 
 [delta]
     navigate = true    # use n and N to move between diff sections
+    side-by-side = true
 
     # delta detects terminal colors automatically; set one of these to disable auto-detection
     # dark = true
     # light = true
 
 [merge]
-    conflictstyle = diff3
+    conflictstyle = zdiff3
 
 [diff]
     colorMoved = default