Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 380:0ceb8554801e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh: make vcs info in prompt async Roughly cribbed from [0], but I'm hoping to rework this soon to use the zsh async library that shouldn't require a tempfile. 0: http://www.anishathalye.com/2015/02/07/an-asynchronous-shell-prompt/
author Augie Fackler <raf@durin42.com>
date Thu, 10 Mar 2016 18:56:28 -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