comparison: .hgrc
.hgrc
- changeset 599
- 724683559a32
- parent 598
- 1698d432a2eb
- child 600
- 0e927f9c141a
equal
deleted
inserted
replaced
| 598:1698d432a2eb | 599:724683559a32 |
|---|---|
| 19 pager = LESS='FSRXi' less | 19 pager = LESS='FSRXi' less |
| 20 | 20 |
| 21 [alias] | 21 [alias] |
| 22 fetch = pull --rebase | 22 fetch = pull --rebase |
| 23 ctags = !~/bin/git-ctags | 23 ctags = !~/bin/git-ctags |
| 24 draft = log -r 'not public()' | |
| 24 | 25 |
| 25 [merge-tools] | 26 [merge-tools] |
| 26 vimdiff.executable = vim | 27 vimdiff.executable = vim |
| 27 vimdiff.args = -d $base $local $output $other +close +close | 28 vimdiff.args = -d $base $local $output $other +close +close |
| 28 vimdiff.check = changed, conflicts | 29 vimdiff.check = changed, conflicts |
