Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 318:4fa9c5ee08d2
zshenv: default timezone should be America/New_York now
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 04 Jul 2013 19:40:33 -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