Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 350:b55a7fe4dfab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: drop obsolete stuff from [alias], enable showfunc in [diff] The alias entry for diff (-p) is the same as [diff] showfunc = 1, but the latter will also do things like improve emails.
author Augie Fackler <raf@durin42.com>
date Wed, 15 Oct 2014 16:23:03 -0400
parents a5ec16bba8a9
children
line wrap: on
line source

# This is broken into its own file on account of not being able to
# properly make opendiff-w bail when opendiff is unavailable.
[merge-tools]
filemerge.priority = 100
filemerge.executable = opendiff-w
filemerge.args = $local $other -ancestor $base -merge $output