Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 385:98480bc457ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emacs: load and use monky monky is kind of slow, but it's been pretty handy so I'm going to just load it all the time until I find a better alternative.
author Augie Fackler <raf@durin42.com>
date Mon, 14 Mar 2016 21:42:39 -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