view unixSoft/hgrc-opendiff @ 520:9af1fc9b713c

zsh: enable iterm2 integration This is the iterm2 integration script as of today. Squinting a bit, this looks like the version of the file from https://github.com/gnachman/iTerm2/commit/3d8173763e1e7f53c08a7da52fc92db4e036395a, which is the most recent edit to the file on github.
author Augie Fackler <raf@durin42.com>
date Thu, 14 Jul 2022 14:08:25 -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