Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 417:57876a8a8165

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
distnoted-reaper.sh: new script to clean up a runaway distnoted This seems to be connected with leaving emacs running, but supposedly the bug is fixed. This is a cronnable script to kill a runaway distnoted without harming one that's not insane.
author Augie Fackler <raf@durin42.com>
date Tue, 09 Aug 2016 19:39:56 -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