Git: Switch back to nvim for diff and mergetool

1 year ago · 82d7b1fbca
parent 5a4174e2d0
commit 82d7b1fbca
1 changed files with 4 additions and 1 deletions
--- a/home/.config/git/config
+++ b/home/.config/git/config
@ -21,7 +21,7 @@
 [merge]
 	prompt = false
  conflictstyle = diff3
-	tool = meld
+	tool = nvim

 [mergetool]
 	keepBackup = false
@ -30,6 +30,9 @@
 [mergetool "nvim"]
 	cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

+[diff]
+  tool = nvim
+
 [difftool]
 	prompt = false