Mercurial > dotfiles

view hgrc/hgrc-MacOSX @ 301:92f460133b0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use Steve Losh's templates from some correct place. Add Jordi's aliases.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 22 May 2015 15:20:20 -0700
parents d190d7987730
children 7d83a5eab234
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