config/git
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove 3 way vimdiff

Browse Source
This commit is contained in:
Kenneth Benzie 2018-12-14 18:32:23 +00:00
parent 71ef3dfba5
commit 9511061155
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config
View File

@ -40,11 +40,6 @@
[help] [help]
autocorrect = -1 autocorrect = -1
[merge]
tool = vimdiff
conflictstyle = diff3
prompt = false
[pager] [pager]
status = true status = true