Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 387:cf3b1ba01e69
hg egrep: ensure we're in the repo root before running grep
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Mon, 01 Feb 2016 17:28:25 -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