Mercurial > ec-dotfiles
diff rc/hg @ 138:f963d52c031a
Merge.
author | Edho Arief <edho@myconan.net> |
---|---|
date | Wed, 02 Nov 2011 22:12:16 +0700 |
parents | a7484f2c9616 |
children | 7dd9ad7f977c |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rc/hg Wed Nov 02 22:12:16 2011 +0700 @@ -0,0 +1,16 @@ +[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 +