Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 403:5c60aa185a97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
common_env: add pip --user paths on OS X to PATH
author Augie Fackler <raf@durin42.com>
date Thu, 28 Jul 2016 10:15:18 -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