Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 363:51aaf8bcd6ec
vcs_functions: fix vcs_current_branch to use hg templating
This takes it from 4 hg invocations to 1, and skips a bunch of pipelines.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 11 Sep 2015 09:53: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