diff --git a/home/.config/git/config b/home/.config/git/config
index 522fca2e..3da38a64 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -21,7 +21,7 @@
 [merge]
 	prompt = false
   conflictstyle = diff3
-	tool = meld
+	tool = nvim
 
 [mergetool]
 	keepBackup = false
@@ -30,6 +30,9 @@
 [mergetool "nvim"]
 	cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 
+[diff]
+  tool = nvim
+
 [difftool]
 	prompt = false