Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 279:0b718e51de16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgignore: ignore machine-specific .elisp/settings/ files Just considers anything with local in the name to be machine specific, which is true for how I use have things configured.
author Augie Fackler <raf@durin42.com>
date Fri, 27 Apr 2012 16:53:15 -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