Mercurial > ec-dotfiles
view hg @ 97:65ce115fd21d
Merge.
author | Edho Prima Arief <edho@myconan.net> |
---|---|
date | Thu, 14 Jul 2011 00:51:44 +0700 |
parents | e17886c8da43 |
children | ed3d1b8e6f45 |
line wrap: on
line source
[ui] username = Edho Prima Arief <edho@myconan.net> merge = vimdiff verbose = true [merge-tools] vimdiff.executable = vim vimdiff.args = -d $base $local $output $other +close +close [extensions] #hgext.convert = #progress =