Update deps

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 8fca4027131952b3d057de9c46508df59f45d851..ff81aab25f4addbaea4f92242dd2a5267461fd22 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -24,6 +24,7 @@
        tool = vimdiff
 [merge]
   tool = nvim
+  conflictstyle = zdiff3
 [mergetool]
   keepBackup = false
 [mergetool "nvim"]