Mercurial > ec-dotfiles

comparison rc/hg @ 129:f18a27a0e8fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch.
author Edho Arief <edho@myconan.net>
date Sat, 29 Oct 2011 11:40:35 +0700
parents a7484f2c9616
children 7dd9ad7f977c
comparison
equal deleted inserted replaced
121:0c3b473b9af7 129:f18a27a0e8fc
1 [ui]
2 username = Edho Prima Arief <edho@myconan.net>
3 merge = vimdiff
4 verbose = true
5
6 [merge-tools]
7 vimdiff.executable = vim
8 vimdiff.args = -d $base $local $output $other +close +close
9
10 [extensions]
11 #hgext.convert =
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