From 6e2f80c8d15730d07e813debc38c977f4d42db01 Mon Sep 17 00:00:00 2001
From: Mica White <botahamec@outlook.com>
Date: Thu, 21 May 2026 00:17:47 -0400
Subject: Zellij

---
 .gitconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 017b981..3f56506 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,11 @@
 	gpgSign = true
 [pull]
 	ff = only
+[merge]
+	conflictStyle = zdiff3
+[core]
+	pager = delta --paging always
+[interactive]
+	diffFilter = delta --color-only
+[delta]
+	navigate = true
-- 
cgit v1.2.3