view hg @ 72:cb20a159ab00

Merge.
author Edho Prima Arief <me@myconan.net>
date Fri, 27 May 2011 10:05:11 -0400
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 =