1 files changed, 8 insertions, 0 deletions
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