[http_proxy]
host = 10.252.128.110:8888
no = localhost

[ui]
username = Kinos Glitschen <kinostl@gmail.com>


[merge-patterns]
** = filemerge

[merge-tools]
filemerge.executable = macvim
filemerge.args = -d $local $other
filemerge.checkchanged = true
filemerge.gui = true

[extensions]
fetch =