Mercurial > dotfiles

annotate hgrc/hgrc-MacOSX @ 484:759ccf5befb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make lightline work when some other plugins are not enabled.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 24 Sep 2020 23:10:38 -0700
parents 4248ef657070
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
458
4248ef657070 Only use the beautifygraph extension on OSes with nice terminals
Ludovic Chabant <ludovic@chabant.com>
parents: 428
diff changeset
5 [extensions]
4248ef657070 Only use the beautifygraph extension on OSes with nice terminals
Ludovic Chabant <ludovic@chabant.com>
parents: 428
diff changeset
6 beautifygraph =
4248ef657070 Only use the beautifygraph extension on OSes with nice terminals
Ludovic Chabant <ludovic@chabant.com>
parents: 428
diff changeset
7
132
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
8 [extdiff]
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
9 cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
10
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
11 [merge-tools]
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
12 kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
13 kdiff3.args = $base $local $other -o $output
d190d7987730 Use `kdiff3` for merging on MacOS.
Ludovic Chabant <ludovic@chabant.com>
parents: 129
diff changeset
14
428
7d83a5eab234 Mercurial pager enabled.
Ludovic Chabant <ludovic@chabant.com>
parents: 132
diff changeset
15 # vim: ft=cfg