Remove 3 way vimdiff
This commit is contained in:
parent
71ef3dfba5
commit
9511061155
5
config
5
config
@ -40,11 +40,6 @@
|
||||
[help]
|
||||
autocorrect = -1
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
prompt = false
|
||||
|
||||
[pager]
|
||||
status = true
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user