Config: Add Neovim as git diff/merge tool
This commit is contained in:
@@ -7,3 +7,11 @@
|
|||||||
[user]
|
[user]
|
||||||
name = Riyyi
|
name = Riyyi
|
||||||
email = riyyi3@gmail.com
|
email = riyyi3@gmail.com
|
||||||
|
[diff]
|
||||||
|
tool = nvimdiff
|
||||||
|
[merge]
|
||||||
|
tool = nvimdiff
|
||||||
|
conflictstyle = diff3
|
||||||
|
[mergetool]
|
||||||
|
prompt = false
|
||||||
|
keepBackup = false
|
||||||
|
|||||||
Reference in New Issue
Block a user