Mercurial > ec-dotfiles

comparison rc/hg @ 248:fbb03c862b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Awesome merge.
author Edho Arief <edho@myconan.net>
date Tue, 08 Nov 2011 11:59:49 +0700
parents 6a43fa890c93
children 89a33efeb338
comparison
equal deleted inserted replaced
132:53b39ca5a6ea 248:fbb03c862b63
1 [ui] 1 [ui]
2 username = Edho Prima Arief <edho@myconan.net> 2 username = Edho 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
12 #progress = 12 #progress =
13 13
14 [hostfingerprints] 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 15 bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe
16 16
17 [defaults]
18 addremove = --similarity 100