Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 477:8373f6924e50
emacs: kludge around a case of emacs being too clever for me
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 21 Feb 2019 19:54:55 -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