Mercurial > dotfiles

view hgrc/hgrc-MacOSX @ 504:015e94f44cc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 30 Sep 2020 21:17:47 -0700
parents 4248ef657070
children
line wrap: on
line source

[ui]
ssh = ssh -C
merge = kdiff3

[extensions]
beautifygraph =

[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