diff --git a/.config/git/config b/.config/git/config
index b4b02f3..b33beb1 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -7,3 +7,11 @@
 [user]
 	name = Riyyi
 	email = riyyi3@gmail.com
+[diff]
+	tool = nvimdiff
+[merge]
+	tool = nvimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
+	keepBackup = false