Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 381:e84b6da69ea0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
async.zsh: import Imported from https://raw.githubusercontent.com/mafredri/zsh-async/master/async.zsh at git revision 032703d.
author Augie Fackler <raf@durin42.com>
date Thu, 10 Mar 2016 18:58:05 -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