Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 342:f95ae07fb55a
hgrc: add havepatch alias for looking for a patch matching a string
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Mon, 01 Sep 2014 13:02:29 -0400 |
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