Switch git mergetool to nvimdiff
This commit is contained in:
parent
e21060ea34
commit
696701e420
1 changed files with 2 additions and 3 deletions
|
@ -8,13 +8,12 @@
|
|||
# Sign commits by default
|
||||
gpgSign = true
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
guitool = gvimdiff
|
||||
tool = nvimdiff
|
||||
[difftool]
|
||||
confirm = false
|
||||
prompt = false
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
tool = nvimdiff
|
||||
[push]
|
||||
default = nothing
|
||||
[alias]
|
||||
|
|
Loading…
Reference in a new issue