nvim for git diff

2024-01-31 20:40:40 -05:00
parent 0e56a7626a
commit 7dd5258f9b
1 changed files with 6 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,9 @@
 	autocrlf = input
 [init]
 	defaultBranch = main
+[merge]
+	tool = nvim
+[mergetool]
+	keepBackup = false
+[mergetool "nvim"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'