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
|
# Sign commits by default
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = nvimdiff
|
||||||
guitool = gvimdiff
|
|
||||||
[difftool]
|
[difftool]
|
||||||
confirm = false
|
confirm = false
|
||||||
prompt = false
|
prompt = false
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = nvimdiff
|
||||||
[push]
|
[push]
|
||||||
default = nothing
|
default = nothing
|
||||||
[alias]
|
[alias]
|
||||||
|
|
Loading…
Reference in a new issue