X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/ff40958cb9fa50b1e194849af0ffab32f1fc8cad..f30e0a60de841c4f3fadf8ca4367352ae638d096:/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"]