git: vimdiff -> nvimdiff
This commit is contained in:
parent
be296837aa
commit
7c8d3a4604
1 changed files with 1 additions and 1 deletions
|
@ -40,5 +40,5 @@
|
|||
smtpserveroption = tdj
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
tool = nvimdiff
|
||||
conflictstyle = diff3
|
||||
|
|
Loading…
Add table
Reference in a new issue