Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 472:79110d94a0c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: filter out display of remotenames that start with "/" I may want to filter out anything that contains a "/" since that'd be a URL instead of a path shortcut, but I'll do that later if it becomes obviously the right choice.
author Augie Fackler <raf@durin42.com>
date Fri, 01 Feb 2019 14:08:50 -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