view hg @ 30:fe9c15fe739a

Branch merge.
author Edho Prima Arief <me@myconan.net>
date Sun, 06 Feb 2011 12:37:46 +0700
parents bbd189f52beb
children a914a2168196
line wrap: on
line source

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

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

[extensions]
hgext.convert = 
hgext.bookmarks =
hgext.rebase =
hggit =