Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 497:2ea29b487b06
zsh: update async to 1.8.5
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 29 Sep 2020 11:11:09 -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