view hg @ 37:be694d1629c8

Merge
author Edho Prima Arief <me@myconan.net>
date Fri, 15 Apr 2011 21:53:12 +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 =