git: Use nvimdiff as merge- and difftool

2020-12-18 23:33:01 +01:00
parent fa2b792d38
commit 25d0729668
1 changed files with 2 additions and 0 deletions
--- a/.config/git/config
+++ b/.config/git/config
@@ -20,6 +20,7 @@
 	submodulesummary = true
 [diff]
 	submodule = log
+	tool = nvimdiff
 [rebase]
 	autostash = true
 [include]
@@ -28,3 +29,4 @@
 	rebase = true
 [merge]
 	log = true
+	tool = nvimdiff