Mercurial > dotfiles

view hgrc/hgrc-MacOSX @ 299:8959592285b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 20 May 2015 16:15:19 -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