mirror of
https://github.com/hcartiaux/dotfiles.git
synced 2024-10-18 17:25:23 +02:00
[git] Updated gitconfig
This commit is contained in:
parent
ebd95d3842
commit
c8ae1160f1
1 changed files with 4 additions and 0 deletions
|
@ -72,6 +72,10 @@
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
conflictstyle = diff3
|
||||||
|
|
||||||
|
[mergetool]
|
||||||
|
prompt = false
|
||||||
|
|
||||||
[http]
|
[http]
|
||||||
sslverify = false
|
sslverify = false
|
||||||
|
|
Loading…
Reference in a new issue