view unixSoft/hgrc-opendiff @ 372:ce87db9038f5

havepatch: new script to easily check if a mailed patch is applied Right now this only works on the hg repo, and it assumes the patch was applied as a descendant of 3.5 to keep the checks quick. In a perfect world I'd be able to do this all with obsolete marker checks, but that doesn't seem to be a good option yet.
author Augie Fackler <raf@durin42.com>
date Tue, 13 Oct 2015 11:04:51 -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