Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 366:dcd78275075f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: rework "smart" revset to exploit upstream() from remotebranches This way you really only see things that aren't pushed, even if you're pushing to a server in draft phase for someone to do a final review pass.
author Augie Fackler <raf@durin42.com>
date Fri, 11 Sep 2015 09:56:16 -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