Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 386:40c0bc5ff266

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: really end vimdiff's reign of terror In fe18716866 I left off the trailing 'd' on 'disabled', because I forgot how my own change to core Mercurial worked.
author Augie Fackler <raf@durin42.com>
date Mon, 14 Mar 2016 22:03:27 -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