Mercurial > dotfiles

annotate hgrc/hgrc-MacOSX @ 132:d190d7987730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use `kdiff3` for merging on MacOS.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:34:57 -0700
parents 766520c00625
children 7d83a5eab234
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
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