diff --git a/git/.gitconfig b/git/.gitconfig
index 3c39c00..01dcae8 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,3 +37,9 @@
     po = push origin
 [core]
 	autocrlf = false
+
+[merge]
+    tool = "nvim"
+
+[mergetool "nvim"]
+	cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"