Mercurial > dotfiles

view unixSoft/hgrc-opendiff @ 282:ba2fd0bed641

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ipythonrc: remove, since newer ipythons don't read this file
author Augie Fackler <raf@durin42.com>
date Tue, 17 Apr 2012 16:30:06 -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