Mercurial > ec-dotfiles
comparison rc/hg @ 321:8f6885874144
More merges!
author | Edho Arief <edho@myconan.net> |
---|---|
date | Sun, 18 Mar 2012 05:08:21 +0000 |
parents | 4b7b95cb6e09 |
children | 00777bea96fb |
comparison
equal
deleted
inserted
replaced
313:72c299437fde | 321:8f6885874144 |
---|---|
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 = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b | 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] |