Config: Add Neovim as git diff/merge tool

9 months ago · a208f458c1
1 changed files with 8 additions and 0 deletions
--- 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