Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 449:7f7255eb9ac3
hgignore: ignore some more directories things insist on creating
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sun, 08 Oct 2017 20:39:03 -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