diff --git a/src/.config/git/config b/src/.config/git/config
index 6b8d20a..0a89364 100644
--- a/src/.config/git/config
+++ b/src/.config/git/config
@@ -3,3 +3,7 @@
 	name = dogeystamp
 [gpg]
 	program = passphrase2pgp
+[merge]
+    tool = nvimmerge
+[mergetool "nvimmerge"]
+	cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""