diff --git a/files/gitconfig b/files/gitconfig
index 979e8e3..c137022 100644
--- a/files/gitconfig
+++ b/files/gitconfig
@@ -52,6 +52,15 @@
 [push]
     default = nothing
 
+[merge]
+    tool = vimdiff
+
+[mergetool]
+    prompt = false
+
+[mergetool "vimdiff"]
+    path = nvim
+
 [color]
     ui = auto