Mercurial > ec-dotfiles
view rc/hg @ 290:889bd8475ca5
Merge.
author | Edho Arief <edho@myconan.net> |
---|---|
date | Thu, 12 Jan 2012 15:03:20 +0700 |
parents | 6a43fa890c93 |
children | 89a33efeb338 |
line wrap: on
line source
[ui] username = Edho 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 = [hostfingerprints] bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe [defaults] addremove = --similarity 100