Mercurial > dotfiles

view hgrc/hgrc-MacOSX @ 455:1172b8484c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add global `gitignore` file.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 13 Nov 2018 09:55:59 -0800
parents 7d83a5eab234
children 4248ef657070
line wrap: on
line source

[ui]
ssh = ssh -C
merge = kdiff3

[extdiff]
cmd.kdiff3 = /Applications/kdiff3.app/Contents/MacOS/kdiff3

[merge-tools]
kdiff3.executable = /Applications/kdiff3.app/Contents/MacOS/kdiff3
kdiff3.args = $base $local $other -o $output

# vim: ft=cfg