comparison: .hgrc
.hgrc
- changeset 881
- a5b3b7b6850c
- parent 845
- 682c71a60aad
equal
deleted
inserted
replaced
| 880:21a8fdcc9f38 | 881:a5b3b7b6850c |
|---|---|
| 1 [ui] | 1 [ui] |
| 2 username = Meredith Howard <mhoward@roomag.org> | 2 username = Meredith Howard <mhoward@roomag.org> |
| 3 merge = vimdiff | 3 merge = vimdiff3 |
| 4 logtemplate = "{logcust}" | 4 logtemplate = "{logcust}" |
| 5 | 5 |
| 6 [extensions] | 6 [extensions] |
| 7 rebase = | 7 rebase = |
| 8 shelve = | 8 shelve = |
| 20 ctags = !~/bin/git-ctags | 20 ctags = !~/bin/git-ctags |
| 21 glog = log -G | 21 glog = log -G |
| 22 draft = log -r 'reverse(not public())' | 22 draft = log -r 'reverse(not public())' |
| 23 | 23 |
| 24 [merge-tools] | 24 [merge-tools] |
| 25 vimdiff.executable = vim | 25 vimdiff3.executable = vim |
| 26 vimdiff.args = -d -c 'hid|hid' $base $local $output $other | 26 vimdiff3.args = -f -d -M $local $base $other $output -c 'hid|hid|hid|set ma write' |
| 27 vimdiff.check = changed, conflicts | 27 vimdiff3.check = changed, conflicts |
| 28 vimdiff3.premerge = keep-merge3 | |
| 28 | 29 |
| 29 [diff] | 30 [diff] |
| 30 git = true | 31 git = true |
| 31 showfunc = true | 32 showfunc = true |
| 32 | 33 |
