Mercurial > ec-dotfiles
annotate rc/hg @ 139:9ff99d9bf388
Merge.
| author | Edho Arief <edho@myconan.net> |
|---|---|
| date | Tue, 01 Nov 2011 22:41:09 +0700 |
| parents | 7dd9ad7f977c |
| children | 6a43fa890c93 |
| rev | line source |
|---|---|
| 0 | 1 [ui] |
| 136 | 2 username = Edho Arief <edho@myconan.net> |
| 10 | 3 merge = vimdiff |
|
34
a914a2168196
Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents:
27
diff
changeset
|
4 verbose = true |
| 10 | 5 |
| 6 [merge-tools] | |
| 7 vimdiff.executable = vim | |
| 8 vimdiff.args = -d $base $local $output $other +close +close | |
| 9 | |
| 14 | 10 [extensions] |
|
45
7e462da3caa0
[hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents:
34
diff
changeset
|
11 #hgext.convert = |
|
7e462da3caa0
[hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents:
34
diff
changeset
|
12 #progress = |
| 104 | 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 |