Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 491:4b2472372fad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mcfly: move binding to ^T instead of ^R I've found some bugs in mcfly's handling of multi-line history entries. I still think it's a useful tool, just maybe less than I was hoping for now...
author Augie Fackler <raf@durin42.com>
date Wed, 01 Jul 2020 13:33:46 -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