From f30e0a60de841c4f3fadf8ca4367352ae638d096 Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <git@r.bdr.sh>
Date: Mon, 19 Feb 2024 20:17:51 +0100
Subject: Update deps

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 8fca402..ff81aab 100644
--- a/gitconfig
+++ b/gitconfig
@@ -24,6 +24,7 @@
 	tool = vimdiff
 [merge]
   tool = nvim
+  conflictstyle = zdiff3
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]
-- 
cgit