diff --git a/git/config b/git/config
index f5713c9..744770a 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,7 @@ defaultBranch = main
 [merge]
 conflictStyle = diff3
 ff = only
+tool = nvimdiff
 
 [pull]
 ff = only