Mercurial > ec-dotfiles
comparison rc/hgrc @ 400:657f787fbae8
Merge remote-tracking branch 'origin/master'
| author | Edho Arief <edho@myconan.net> | 
|---|---|
| date | Tue, 04 Sep 2012 10:23:37 +0700 | 
| parents | 89766794cd99 | 
| children | 39d983d49349 | 
   comparison
  equal
  deleted
  inserted
  replaced
| 395:c01d272af466 | 400:657f787fbae8 | 
|---|---|
| 8 vimdiff.executable = vim | 8 vimdiff.executable = vim | 
| 9 vimdiff.args = -d $base $local $output $other +close +close | 9 vimdiff.args = -d $base $local $output $other +close +close | 
| 10 | 10 | 
| 11 [extensions] | 11 [extensions] | 
| 12 #hgext.convert = | 12 #hgext.convert = | 
| 13 #progress = | 13 progress = | 
| 14 hgext.bookmarks = | 14 hgext.bookmarks = | 
| 15 mq = | 15 mq = | 
| 16 rebase = | 16 rebase = | 
| 17 graphlog = | |
| 18 color = | |
| 17 | 19 | 
| 18 [hostfingerprints] | 20 [hostfingerprints] | 
| 19 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b | 21 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b | 
| 20 | 22 | 
| 21 [defaults] | 23 [defaults] | 
| 22 addremove = --similarity 100 | 24 addremove = --similarity 100 | 
| 25 | |
| 26 [alias] | |
| 27 ll = log --style default | |
| 28 | |
| 29 [bookmarks] | |
| 30 track.current = true | 
