comparison: .hgrc
.hgrc
- changeset 198
- a4b45bcb4ba9
- parent 80
- e2d834280dae
- child 209
- 557d2468f900
equal
deleted
inserted
replaced
| 197:85a414f67356 | 198:a4b45bcb4ba9 |
|---|---|
| 16 [pager] | 16 [pager] |
| 17 pager = LESS='FSRX' less | 17 pager = LESS='FSRX' less |
| 18 | 18 |
| 19 [alias] | 19 [alias] |
| 20 fetch = pull --rebase | 20 fetch = pull --rebase |
| 21 ctags = !~/.hg_helpers/ctags | |
| 21 | 22 |
| 22 [merge-tools] | 23 [merge-tools] |
| 23 vimdiff.executable = vim | 24 vimdiff.executable = vim |
| 24 vimdiff.args = -d $base $local $output $other +close +close | 25 vimdiff.args = -d $base $local $output $other +close +close |
| 25 vimdiff.check = changed, conflicts | 26 vimdiff.check = changed, conflicts |
