Mercurial > ec-dotfiles

view hg @ 118:131e1ddf8d43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Edho Prima Arief <edho@myconan.net>
date Fri, 21 Oct 2011 14:15:10 +0700
parents ed3d1b8e6f45
children
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 =

[hostfingerprints]
bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe