Use 'nvimdiff' as mergetool
This commit is contained in:
1 parent
454b80aa4e
commit
4ca7557e98
1 file changed
+1
-1
+1
-1
@@ -71,7 +71,7 @@
|
|||||||
helper = !/usr/bin/gh auth git-credential
|
helper = !/usr/bin/gh auth git-credential
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = nvimdiff
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
|||||||
Reference in new issue
Block a user