comparison: .hgrc
.hgrc
- changeset 79
- 4635b3f5bc23
- parent 8
- ba72a71f23e6
- child 80
- e2d834280dae
equal
deleted
inserted
replaced
| 78:cb0028ec05e3 | 79:4635b3f5bc23 |
|---|---|
| 1 [ui] | 1 [ui] |
| 2 username = Meredith Howard <mhoward@roomag.org> | 2 username = Meredith Howard <mhoward@roomag.org> |
| 3 merge = vimdiff | |
| 3 | 4 |
| 4 [extensions] | 5 [extensions] |
| 5 hgext.graphlog = | 6 hgext.graphlog = |
| 6 rebase = | 7 rebase = |
| 7 color = | 8 color = |
| 15 pager = LESS='FSRX' less | 16 pager = LESS='FSRX' less |
| 16 | 17 |
| 17 [alias] | 18 [alias] |
| 18 fetch = pull --rebase | 19 fetch = pull --rebase |
| 19 | 20 |
| 21 [merge-tools] | |
| 22 vimdiff.executable = vim | |
| 23 vimdiff.args = -d $base $local $output $other +close +close | |
| 24 vimdiff.check = changed, conflicts | |
| 25 | |
| 26 | |
| 20 %include ~/.hgrc.local | 27 %include ~/.hgrc.local |
