Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 384:7e97572ac429
emacs: start using git-gutter-mode with Mercurial enabled
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Mon, 14 Mar 2016 21:41:49 -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