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