git: use nvim as mergetool (and difftool)

2021-01-03 23:50:49 +01:00 · 2021-01-03 23:50:49 +01:00 · 57aaa79a30
commit 57aaa79a30
parent 3ad4f7d72b
1 changed files with 9 additions and 0 deletions
--- a/files/gitconfig
+++ b/files/gitconfig
@ -52,6 +52,15 @@
 [push]
    default = nothing

+[merge]
+    tool = vimdiff
+
+[mergetool]
+    prompt = false
+
+[mergetool "vimdiff"]
+    path = nvim
+
 [color]
    ui = auto