diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2
index 3c1e9d9..8391d19 100644
--- a/templates/gitconfig.j2
+++ b/templates/gitconfig.j2
@@ -8,3 +8,6 @@ editor = nvim
 
 [pull]
 rebase = false
+
+[merge]
+tool = nvimdiff