Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 360:412a0d3c7d87
hg: add bookmarked obsolete changes to upstream-bookmarks
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 13 Mar 2015 16:06:17 -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