git: Remove nvimdiff as merge.tool
This commit is contained in:
@@ -34,7 +34,6 @@
|
|||||||
[merge]
|
[merge]
|
||||||
log = true
|
log = true
|
||||||
suppressDest = *
|
suppressDest = *
|
||||||
tool = nvimdiff
|
|
||||||
[pretty]
|
[pretty]
|
||||||
fixes = Fixes: %h (\"%s\")
|
fixes = Fixes: %h (\"%s\")
|
||||||
[pull]
|
[pull]
|
||||||
|
|||||||
Reference in New Issue
Block a user