Git config cleanup done
This commit is contained in:
parent
09363311c9
commit
664c3518d2
@ -26,16 +26,11 @@
|
||||
autoSetupRemote = true
|
||||
|
||||
# Diffs and Merges {{{
|
||||
[diff]
|
||||
tool = Kaleidoscope
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
trustExitCode = true
|
||||
|
||||
[merge]
|
||||
tool = Kaleidoscope
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
conflictstyle = diff3
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user