Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 291:142fb39e4e55
hg-rebase-all: correctly use rebase result code
Exit status 1 can mean "nothing to rebase", which isn't helpful for
our case. Added a slight tangle of if statements to work around that.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Wed, 17 Oct 2012 08:21:28 -0500 |
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