Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 270:1e2125a577da
_hg: import updated version from upstream
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 12 Dec 2011 11:47:26 -0600 |
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