Mercurial > ec-dotfiles
view hg @ 102:7a287a518718
Merge.
| author | Edho Prima Arief <edho@myconan.net> |
|---|---|
| date | Thu, 18 Aug 2011 15:20:54 +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 =
