Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 338:3f3d52956ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: use detailed merge markers by default
author Augie Fackler <raf@durin42.com>
date Fri, 18 Jul 2014 20:15:41 -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