Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 357:c7a9cd793e37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchpipe: handle base64-encoded message bodies It looks like the new version of mailman on selenic now base64s message bodies, so detect that and unpack the base64'd body.
author Augie Fackler <raf@durin42.com>
date Mon, 22 Dec 2014 17:12:53 -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