Mercurial > ec-dotfiles
view hg @ 38:8eebbf68181c
Merge!
author | Edho Prima Arief <me@myconan.net> |
---|---|
date | Fri, 15 Apr 2011 21:55:47 +0700 |
parents | a914a2168196 |
children | 7e462da3caa0 |
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 =