Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 329:c35b58b40fcb
textmate.el: use egrep instead
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Tue, 11 Mar 2014 14:16:34 -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