Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 465:30e2d7308c09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emacs: disable TRAMP cache to avoid annoying problems
author Augie Fackler <raf@durin42.com>
date Wed, 28 Nov 2018 15:46:04 -0500
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