view hg @ 20:c345234efaf5

Merge. I don't even remember when I committed this.
author Edho Prima Arief <me@myconan.net>
date Fri, 05 Nov 2010 23:02:37 +0700
parents 83fb6c590b38
children bbd189f52beb
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 =