Mercurial > ec-dotfiles
view rc/hg @ 311:dd2ddddf00d5
Merge.
author | Edho Arief <edho@myconan.net> |
---|---|
date | Wed, 07 Mar 2012 14:17:51 +0700 |
parents | 4b7b95cb6e09 |
children | 00777bea96fb |
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 = hgext.bookmarks = [hostfingerprints] bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b [defaults] addremove = --similarity 100