Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 473:f86c1048a46d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emacs: hack up my textmate.el some more to add searching config This gives up and use a bonus grep for extension filtering because I can't quite make the rg flags work like the grep one, and this gets the job done with minimal fuss.
author Augie Fackler <raf@durin42.com>
date Fri, 01 Feb 2019 16:25:05 -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