1 files changed, 1 insertions, 0 deletions
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"]