Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 425:d0a5109cdfe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
custom: disable magit-auto-revert-mode This seems to interact poorly with global-auto-revert mode and tramp, so just drop it for now.
author Augie Fackler <raf@durin42.com>
date Tue, 29 Nov 2016 13:35:42 -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