view hg @ 34:a914a2168196

Merge, removed git support.
author Edho Prima Arief <me@myconan.net>
date Sun, 27 Mar 2011 11:32:23 +0000
parents bbd189f52beb
children 7e462da3caa0
line wrap: on
line source

[ui]
username = Edho Prima Arief <me@myconan.net>
merge = vimdiff
verbose = true

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close

[extensions]
hgext.convert = 
progress =