Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 334:1f6b813777c8
Add imagemagick spell from https://gist.github.com/lelandbatey/8677901
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Wed, 16 Apr 2014 10:09:05 -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