Use 'nvimdiff' as mergetool
parent
454b80aa4e
commit
4ca7557e98
|
@ -71,7 +71,7 @@
|
|||
helper = !/usr/bin/gh auth git-credential
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
tool = nvimdiff
|
||||
conflictstyle = diff3
|
||||
[pull]
|
||||
rebase = true
|
||||
|
|
Loading…
Reference in New Issue