Mercurial > ec-dotfiles
comparison rc/hg @ 311:dd2ddddf00d5
Merge.
| author | Edho Arief <edho@myconan.net> |
|---|---|
| date | Wed, 07 Mar 2012 14:17:51 +0700 |
| parents | 4b7b95cb6e09 |
| children | 00777bea96fb |
comparison
equal
deleted
inserted
replaced
| 283:108e05eb9b5c | 311:dd2ddddf00d5 |
|---|---|
| 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 hgext.bookmarks = | |
| 13 | 14 |
| 14 [hostfingerprints] | 15 [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 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b |
| 16 | 17 |
| 17 [defaults] | 18 [defaults] |
| 18 addremove = --similarity 100 | 19 addremove = --similarity 100 |
