Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 530:dbb75edda2ff default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: remove ancient distnoted reaper script Surely this bug has been fixed in the 9+ years that the script has been run once a minute by cron on my laptop. To my surprise, it looks like the Migration Assistant even managed to carry it across laptops!
author Augie Fackler <raf@durin42.com>
date Sat, 03 Jan 2026 19:12:16 -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