Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 315:fe07e9bdae61
hgrc: histedit is now included with hg
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 06 Jul 2012 21:17:51 -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