1 files changed, 12 insertions, 4 deletions
diff --git a/.config/git/config b/.config/git/config
index d8d52cb..ab82f44 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,3 +1,14 @@
+[core]
+    pager = delta
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true  # use n and N to move between diff sections
+    dark = true      # or light = true, or omit for auto-detection
+    side-by-side = true
+
 [commit]
 	gpgsign = false
 
@@ -5,10 +16,7 @@
 	format = "ssh"
 
 [merge]
-	tool = "fugitive"
-
-[mergetool "fugitive"]
-	cmd = "vim -f -c \"Gdiff\" \"$MERGED\""
+  conflictStyle = zdiff3
 
 [user]
 	email = "ivi@vinkies.net"