Mercurial > ec-dotfiles

view rc/hg @ 308:59543eaa818f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Edho Arief <edho@myconan.net>
date Mon, 20 Feb 2012 13:15:35 +0000
parents 89a33efeb338
children 4b7b95cb6e09
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 = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b

[defaults]
addremove = --similarity 100