Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 325:64e73453e43f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xmonad: Pull apart custom layout into something readable This change doesn't affect any behavior, but it does document the custom layout by naming function parameters. Hopefully, this will make things easier to fix the next time the XMonad developers break us.
author Lucas Bergman <lucas@bergmans.us>
date Tue, 11 Mar 2014 12:49: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