Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 480:4c5814d3cfd8
afcopy: some enhancements from Bryan's dotfiles
This makes `afcopy` able to drop things in the clipboard over ssh. Wild stuff.
See
https://bitbucket.org/bcmills/dotfiles/src/101956eeb90160f1d225ae23c8e6566c9df91c5c/bin/clip?at=default&fileviewer=file-view-default
for some details.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 14 Mar 2019 10:38:49 -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