Mercurial > dotfiles

view 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
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