Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 321:e9932cf1692f
certfor: make zsh-specific
This was mysteriously breaking login on my workstation.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 16 Jul 2013 13:40:31 -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