diff --git a/home/.gitconfig b/home/.gitconfig
index 82af7f4..f95799a 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -5,3 +5,10 @@
 [commit]
 	signoff = true
 	gpgsign = true
+[diff]
+    tool = vimdiff
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool "vimdiff"]
+    cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'