comparison: .hgrc
.hgrc
- changeset 612
- 7b075a4427d8
- parent 600
- 0e927f9c141a
- child 633
- 9308569cd9ba
equal
deleted
inserted
replaced
| 611:f524f24b23dd | 612:7b075a4427d8 |
|---|---|
| 23 ctags = !~/bin/git-ctags | 23 ctags = !~/bin/git-ctags |
| 24 draft = log -r 'not public()' | 24 draft = log -r 'not public()' |
| 25 | 25 |
| 26 [merge-tools] | 26 [merge-tools] |
| 27 vimdiff.executable = vim | 27 vimdiff.executable = vim |
| 28 vimdiff.args = -d $base $local $output $other +close +close | 28 vimdiff.args = -d -c 'hid|hid' $base $local $output $other |
| 29 vimdiff.check = changed, conflicts | 29 vimdiff.check = changed, conflicts |
| 30 | 30 |
| 31 [diff] | 31 [diff] |
| 32 git = true | 32 git = true |
| 33 showfunc = true | 33 showfunc = true |
