Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 354:3d46ce32c14e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
which-function-mode: only enable in emacs 24.4 and later Emacs 24.3.x has a bug in which-function-mode that causes my emacs to lock up for several seconds. Rather than tolerate that, just disable which-function-mode on those systems.
author Augie Fackler <raf@durin42.com>
date Tue, 18 Nov 2014 17:17:36 -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