view hg @ 86:4a22703b183c

Merge.
author Edho Prima Arief <me@myconan.net>
date Sat, 09 Jul 2011 15:39:00 +0700
parents 7e462da3caa0
children e17886c8da43
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 =