Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 262:3350b219b653

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wcroot: use git to directly find repo root. git cleverly hides this under git-rev-parse, which isn't a place I'd have ever thought to look. Thanks to Jacob Lee for the tip.
author Augie Fackler <durin42@gmail.com>
date Fri, 17 Jun 2011 09:46:17 -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