view hg @ 62:996aa2f81721

[bash] various fixes: - export the path first thing - also add export on sunos case. - alias early - unused _has_bsd_ls - added openbsd, check for colorls which is an awesome command
author Edho Prima Arief <me@myconan.net>
date Fri, 06 May 2011 03:15:24 +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 =