Mercurial > public > dotfiles
annotate hg/.hgrc @ 28:cae546f293ff
Merge
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Thu, 27 Oct 2016 20:36:14 -0500 |
| parents | aa1019ab89b4 |
| children |
| rev | line source |
|---|---|
| bgneal@12 | 1 [ui] |
| bgneal@12 | 2 username = Brian Neal <bgneal@gmail.com> |
| bgneal@12 | 3 editor = vim |
| bgneal@12 | 4 ssh = ssh -C |
| bgneal@12 | 5 merge = kdiff3 |
| bgneal@12 | 6 |
| bgneal@12 | 7 [extensions] |
| bgneal@12 | 8 color = |
| bgneal@12 | 9 graphlog = |
| bgneal@12 | 10 hgext.extdiff = |
| bgneal@12 | 11 hgext.convert = |
| bgneal@12 | 12 pager = |
| bgneal@12 | 13 progress = |
| bgneal@27 | 14 shelve = |
| bgneal@12 | 15 |
| bgneal@12 | 16 [extdiff] |
| bgneal@12 | 17 cmd.kdiff3 = |
| bgneal@12 | 18 |
| bgneal@12 | 19 [merge-tools] |
| bgneal@12 | 20 kdiff3.args =--L1 base --L2 local --L3 other $base $local $other -o $output |
| bgneal@12 | 21 |
| bgneal@12 | 22 [convert] |
| bgneal@12 | 23 svn.trunk = madeira/trunk |
| bgneal@12 | 24 svn.branches = madeira/branches |
| bgneal@12 | 25 svn.tags = madeira/tags |
| bgneal@12 | 26 |
| bgneal@12 | 27 [pager] |
| bgneal@12 | 28 pager = LESS='FRX' less |
| bgneal@15 | 29 attend = annotate, cat, diff, export, glog, log, qdiff, help |