Use nvimdiff as git difftool and mergetool
parent
22eab4814c
commit
f07a720a72
|
@ -9,11 +9,11 @@
|
||||||
[web]
|
[web]
|
||||||
browser = xdg-open
|
browser = xdg-open
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = nvimdiff
|
||||||
[difftool]
|
[difftool]
|
||||||
prompt = false
|
prompt = true
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = nvimdiff
|
||||||
[mergetool]
|
[mergetool]
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
[guitool "Add to .gitignore"]
|
[guitool "Add to .gitignore"]
|
||||||
|
|
Loading…
Reference in New Issue