diff --git a/.config/git/config b/.config/git/config
index fb4e8f6..ca51773 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -20,6 +20,7 @@
 	submodulesummary = true
 [diff]
 	submodule = log
+	tool = nvimdiff
 [rebase]
 	autostash = true
 [include]
@@ -28,3 +29,4 @@
 	rebase = true
 [merge]
 	log = true
+	tool = nvimdiff