diff --git a/gitconfig b/gitconfig
index de37bc5..4795673 100644
--- a/gitconfig
+++ b/gitconfig
@@ -34,6 +34,11 @@
 
 [merge]
     conflictstyle = zdiff3
+    tool = nvim-diffview
+
+[merge "nvim-diffview"]
+  cmd = "nvim +DiffviewOpen"
+  prompt = false
 
 [rebase]
     autoSquash = true