use side-by-side for delta diff output

2025-06-13 18:13:43 -06:00
parent 0a3aac427b
commit f81012d8b8
1 changed files with 2 additions and 1 deletions
--- 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