Mercurial > ec-dotfiles

comparison hg @ 113:9b91e702c19c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Latestest merge.
author Edho Prima Arief <edho@myconan.net>
date Wed, 19 Oct 2011 06:51:43 +0000
parents ed3d1b8e6f45
children
comparison
equal deleted inserted replaced
88:917b525eaee0 113:9b91e702c19c
1 [ui] 1 [ui]
2 username = Edho Prima Arief <me@myconan.net> 2 username = Edho Prima Arief <edho@myconan.net>
3 merge = vimdiff 3 merge = vimdiff
4 verbose = true 4 verbose = true
5 5
6 [merge-tools] 6 [merge-tools]
7 vimdiff.executable = vim 7 vimdiff.executable = vim
8 vimdiff.args = -d $base $local $output $other +close +close 8 vimdiff.args = -d $base $local $output $other +close +close
9 9
10 [extensions] 10 [extensions]
11 #hgext.convert = 11 #hgext.convert =
12 #progress = 12 #progress =
13
14 [hostfingerprints]
15 bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe
16