Mercurial > dotfiles
annotate hgrc/hgrc-MacOSX @ 420:e6b3048980c4
Vim tweaks
- Properly check for whether a plugin is active.
- Better function key shortcuts.
- Remove `wildignore` from Gutentags command lines, add them to `ctagsrc`.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 13 Feb 2018 11:08:26 -0800 |
parents | d190d7987730 |
children | 7d83a5eab234 |
rev | line source |
---|---|
129
766520c00625
Use proper SSH options.
Ludovic Chabant <ludovic@chabant.com>
parents:
82
diff
changeset
|
1 [ui] |
766520c00625
Use proper SSH options.
Ludovic Chabant <ludovic@chabant.com>
parents:
82
diff
changeset
|
2 ssh = ssh -C |
132
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
3 merge = kdiff3 |
129
766520c00625
Use proper SSH options.
Ludovic Chabant <ludovic@chabant.com>
parents:
82
diff
changeset
|
4 |
132
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
5 [extdiff] |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
6 cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3 |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
7 |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
8 [merge-tools] |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
9 kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3 |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
10 kdiff3.args = $base $local $other -o $output |
d190d7987730
Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents:
129
diff
changeset
|
11 |