Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 370:1e4a6dcc043d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: clean up machine-specific settings handling HGRCPATH ends up overriding machine-wide settings, which isn't what I want. Recent hg is nice enough to silently ignore includes of nonexistent files, so just use %include now.
author Augie Fackler <raf@durin42.com>
date Fri, 25 Sep 2015 14:42:23 -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