comparison: .hgrc
.hgrc
- changeset 598
- 1698d432a2eb
- parent 597
- bcc7823e8991
- child 599
- 724683559a32
equal
deleted
inserted
replaced
| 597:bcc7823e8991 | 598:1698d432a2eb |
|---|---|
| 1 [ui] | 1 [ui] |
| 2 username = Meredith Howard <mhoward@roomag.org> | 2 username = Meredith Howard <mhoward@roomag.org> |
| 3 merge = vimdiff | 3 merge = vimdiff |
| 4 logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" | 4 logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" |
| 5 | 5 |
| 6 [extensions] | 6 [extensions] |
| 7 color = | 7 color = |
| 8 graphlog = | 8 graphlog = |
| 22 fetch = pull --rebase | 22 fetch = pull --rebase |
| 23 ctags = !~/bin/git-ctags | 23 ctags = !~/bin/git-ctags |
| 24 | 24 |
| 25 [merge-tools] | 25 [merge-tools] |
| 26 vimdiff.executable = vim | 26 vimdiff.executable = vim |
| 27 vimdiff.args = -d $base $local $output $other +close +close | 27 vimdiff.args = -d $base $local $output $other +close +close |
| 28 vimdiff.check = changed, conflicts | 28 vimdiff.check = changed, conflicts |
| 29 | 29 |
| 30 [diff] | 30 [diff] |
| 31 git = true | 31 git = true |
| 32 showfunc = true | 32 showfunc = true |
| 33 | 33 |
| 34 [schemes] | |
| 35 gh = git://github.com/ | |
| 36 gh+ssh = git+ssh://github.com/ | |
| 37 | |
| 34 [color] | 38 [color] |
| 35 diff.hunk = cyan | 39 diff.hunk = cyan |
| 36 log.changeset = magenta | 40 log.changeset = magenta |
| 37 logcust.date = green | 41 logcust.date = green |
| 38 logcust.user = cyan | 42 logcust.user = cyan |
| 39 logcust.decorate = yellow | 43 logcust.decorate = yellow |
| 40 changeset.draft = dim | 44 changeset.draft = dim |
| 41 changeset.secret = dim underline | 45 changeset.secret = dim underline |
| 42 | 46 |
| 43 [templatealias] | 47 [templatealias] |
| 44 phaseset = "{label("changeset.{phase}", rev)}:{label('log.changeset', node|short)}" | 48 phaseset = "{label("changeset.{phase}", rev)}:{label('log.changeset', node|short)}" |
| 45 decorate = "{if(branches, " ({branches})")}{if(tags, " <{tags}>")}{if(bookmarks, " [{bookmarks}]")}" | 49 decorate = "{if(branches, " ({branches})")}{if(tags, " <{tags}>")}{if(bookmarks, " [{bookmarks}]")}" |
| 46 | 50 |
