Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 388:c35759aceed4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emacs: add a hook to handle ANSI colors in compilation buffers Some tools just blindly assume they're printing to a color-supporting terminal. Since fixing them is probably impractical, we'll just work around their stupidity.
author Augie Fackler <raf@durin42.com>
date Mon, 01 Feb 2016 17:30:54 -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